diff --git a/LICENSE b/LICENSE
index 1aba3bc..e890461 120000
--- a/LICENSE
+++ b/LICENSE
@@ -1 +1 @@
-import-layers/yocto-poky/LICENSE
\ No newline at end of file
+poky/LICENSE
\ No newline at end of file
diff --git a/bitbake b/bitbake
index 2efcd22..e601b4f 120000
--- a/bitbake
+++ b/bitbake
@@ -1 +1 @@
-import-layers/yocto-poky/bitbake
\ No newline at end of file
+poky/bitbake/
\ No newline at end of file
diff --git a/documentation b/documentation
deleted file mode 120000
index fb5ebfb..0000000
--- a/documentation
+++ /dev/null
@@ -1 +0,0 @@
-import-layers/yocto-poky/documentation
\ No newline at end of file
diff --git a/import-layers/HOWTO-update.md b/import-layers/HOWTO-update.md
deleted file mode 100644
index b2cc749..0000000
--- a/import-layers/HOWTO-update.md
+++ /dev/null
@@ -1,44 +0,0 @@
-The directories here are managed with 'git subtree'.  The syntax for this is
-non-intuitive, so it is documented below.
-
-The yocto-poky tree should always be based on a real tag, like 'yocto-2.2'.
-The other trees should be the latest commit of the branch named after the
-corresponding yocto tree.  Ex. yocto-2.2 == "morty", so "origin/morty".
-
-We always require developers to submit changes in these trees upstream first
-and only once they have been merged upstream do we backport them.  When
-updating a tree, it is possible that some of the backported commits are not
-yet in the sub-tree.  For instance, if we are on yocto-2.1 and upgrading to
-yocto-2.2, a developer might have backported a commit from what-will-become
-yocto-2.3 and we need to preserve this commit.  Thus, you'll need to take
-an inventory of these commits to re-cherry-pick at the end of the sub-tree
-update process.
-
-```
-# Use git-log to keep track of the current commit.
-git log -n1 --oneline
-
-# Run 'subtree split --rejoin' so git will re-calculate how the current
-# subtree differs from the original external repository.
-git subtree split --prefix=import-layers/meta-openembedded --rejoin
-
-# Run 'subtree pull' to update the subtree.
-git subtree pull --prefix=import-layers/meta-openembedded --squash \
-        ../imports/meta-openembedded origin/morty
-
-# Use git-log to find the 'squash' commit created by 'subtree pull'.
-# Keep record of the 2nd commit titled "Squashed ...".
-git log -n2 --oneline
-
-# Return to your original tree state.
-git checkout <original>
-
-# Cherry-pick the 'subtree pull' 'squash' commit.
-git cherry-pick --strategy=subtree <saved>
-
-# re-apply (cherry-pick) unmerged backports and rebase --interactive to
-# 'fixup' them into the subtree  cherry-pick.
-git cherry-pick <reapply>
-...
-git rebase --interactive <original>
-```
diff --git a/meta b/meta
index 732622a..6a0155a 120000
--- a/meta
+++ b/meta
@@ -1 +1 @@
-import-layers/yocto-poky/meta
\ No newline at end of file
+poky/meta
\ No newline at end of file
diff --git a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/conf/bblayers.conf.sample
index 811368c..50aab07 100644
--- a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/conf/bblayers.conf.sample
@@ -8,11 +8,11 @@
 BBLAYERS ?= " \
   ##OEROOT##/meta \
   ##OEROOT##/meta-poky \
-  ##OEROOT##/import-layers/meta-openembedded/meta-oe \
-  ##OEROOT##/import-layers/meta-openembedded/meta-networking \
-  ##OEROOT##/import-layers/meta-openembedded/meta-perl \
-  ##OEROOT##/import-layers/meta-openembedded/meta-python \
-  ##OEROOT##/import-layers/meta-openembedded/meta-webserver \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-perl \
+  ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-arm \
@@ -22,11 +22,11 @@
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
   ##OEROOT##/meta-poky \
-  ##OEROOT##/import-layers/meta-openembedded/meta-oe \
-  ##OEROOT##/import-layers/meta-openembedded/meta-networking \
-  ##OEROOT##/import-layers/meta-openembedded/meta-perl \
-  ##OEROOT##/import-layers/meta-openembedded/meta-python \
-  ##OEROOT##/import-layers/meta-openembedded/meta-webserver \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-perl \
+  ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-arm \
diff --git a/meta-openbmc-machines/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample
index b428881..4b3e798 100644
--- a/meta-openbmc-machines/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/bblayers.conf.sample
@@ -8,10 +8,10 @@
 BBLAYERS ?= " \
   ##OEROOT##/meta \
   ##OEROOT##/meta-poky \
-  ##OEROOT##/import-layers/meta-openembedded/meta-oe \
-  ##OEROOT##/import-layers/meta-openembedded/meta-networking \
-  ##OEROOT##/import-layers/meta-openembedded/meta-python \
-  ##OEROOT##/import-layers/meta-openembedded/meta-webserver \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-evb \
@@ -21,10 +21,10 @@
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
   ##OEROOT##/meta-poky \
-  ##OEROOT##/import-layers/meta-openembedded/meta-oe \
-  ##OEROOT##/import-layers/meta-openembedded/meta-networking \
-  ##OEROOT##/import-layers/meta-openembedded/meta-python \
-  ##OEROOT##/import-layers/meta-openembedded/meta-webserver \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-evb \
diff --git a/meta-openbmc-machines/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample
index 454e217..fefa416 100644
--- a/meta-openbmc-machines/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/bblayers.conf.sample
@@ -8,9 +8,9 @@
 BBLAYERS ?= " \
   ##OEROOT##/meta \
   ##OEROOT##/meta-poky \
-  ##OEROOT##/import-layers/meta-openembedded/meta-oe \
-  ##OEROOT##/import-layers/meta-openembedded/meta-networking \
-  ##OEROOT##/import-layers/meta-openembedded/meta-python \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-openbmc-bsp/meta-nuvoton \
   ##OEROOT##/meta-openbmc-machines/meta-evb \
@@ -20,9 +20,9 @@
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
   ##OEROOT##/meta-poky \
-  ##OEROOT##/import-layers/meta-openembedded/meta-oe \
-  ##OEROOT##/import-layers/meta-openembedded/meta-networking \
-  ##OEROOT##/import-layers/meta-openembedded/meta-python \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-openbmc-bsp/meta-nuvoton \
   ##OEROOT##/meta-openbmc-machines/meta-evb \
diff --git a/meta-openbmc-machines/meta-evb/meta-evb-raspberrypi/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-evb/meta-evb-raspberrypi/conf/bblayers.conf.sample
index d70b2b1..5db0501 100644
--- a/meta-openbmc-machines/meta-evb/meta-evb-raspberrypi/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-evb/meta-evb-raspberrypi/conf/bblayers.conf.sample
@@ -8,20 +8,20 @@
 BBLAYERS ?= " \
   ##OEROOT##/meta \
   ##OEROOT##/meta-poky \
-  ##OEROOT##/import-layers/meta-openembedded/meta-oe \
-  ##OEROOT##/import-layers/meta-openembedded/meta-networking \
-  ##OEROOT##/import-layers/meta-openembedded/meta-python \
-  ##OEROOT##/import-layers/meta-openembedded/meta-webserver \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/import-layers/meta-raspberrypi \
+  ##OEROOT##/meta-raspberrypi \
   "
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
   ##OEROOT##/meta-poky \
-  ##OEROOT##/import-layers/meta-openembedded/meta-oe \
-  ##OEROOT##/import-layers/meta-openembedded/meta-networking \
-  ##OEROOT##/import-layers/meta-openembedded/meta-python \
-  ##OEROOT##/import-layers/meta-openembedded/meta-webserver \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
-  ##OEROOT##/import-layers/meta-raspberrypi \
+  ##OEROOT##/meta-raspberrypi \
   "
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/bblayers.conf.sample
index 9be37e6..48f8174 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/bblayers.conf.sample
@@ -8,11 +8,11 @@
 BBLAYERS ?= " \
   ##OEROOT##/meta \
   ##OEROOT##/meta-poky \
-  ##OEROOT##/import-layers/meta-openembedded/meta-oe \
-  ##OEROOT##/import-layers/meta-openembedded/meta-networking \
-  ##OEROOT##/import-layers/meta-openembedded/meta-perl \
-  ##OEROOT##/import-layers/meta-openembedded/meta-python \
-  ##OEROOT##/import-layers/meta-openembedded/meta-webserver \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-perl \
+  ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-openpower \
@@ -22,11 +22,11 @@
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
   ##OEROOT##/meta-poky \
-  ##OEROOT##/import-layers/meta-openembedded/meta-oe \
-  ##OEROOT##/import-layers/meta-openembedded/meta-networking \
-  ##OEROOT##/import-layers/meta-openembedded/meta-perl \
-  ##OEROOT##/import-layers/meta-openembedded/meta-python \
-  ##OEROOT##/import-layers/meta-openembedded/meta-webserver \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-perl \
+  ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-openpower \
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/bblayers.conf.sample
index 5751320..83eed8b 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/conf/bblayers.conf.sample
@@ -8,11 +8,11 @@
 BBLAYERS ?= " \
   ##OEROOT##/meta \
   ##OEROOT##/meta-poky \
-  ##OEROOT##/import-layers/meta-openembedded/meta-oe \
-  ##OEROOT##/import-layers/meta-openembedded/meta-networking \
-  ##OEROOT##/import-layers/meta-openembedded/meta-perl \
-  ##OEROOT##/import-layers/meta-openembedded/meta-python \
-  ##OEROOT##/import-layers/meta-openembedded/meta-webserver \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-perl \
+  ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-openpower \
@@ -22,11 +22,11 @@
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
   ##OEROOT##/meta-poky \
-  ##OEROOT##/import-layers/meta-openembedded/meta-oe \
-  ##OEROOT##/import-layers/meta-openembedded/meta-networking \
-  ##OEROOT##/import-layers/meta-openembedded/meta-perl \
-  ##OEROOT##/import-layers/meta-openembedded/meta-python \
-  ##OEROOT##/import-layers/meta-openembedded/meta-webserver \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-perl \
+  ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-openpower \
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/bblayers.conf.sample
index aa8a2b3..ab22ee1 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/bblayers.conf.sample
@@ -8,11 +8,11 @@
 BBLAYERS ?= " \
   ##OEROOT##/meta \
   ##OEROOT##/meta-poky \
-  ##OEROOT##/import-layers/meta-openembedded/meta-oe \
-  ##OEROOT##/import-layers/meta-openembedded/meta-networking \
-  ##OEROOT##/import-layers/meta-openembedded/meta-perl \
-  ##OEROOT##/import-layers/meta-openembedded/meta-python \
-  ##OEROOT##/import-layers/meta-openembedded/meta-webserver \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-perl \
+  ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-openpower \
@@ -22,11 +22,11 @@
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
   ##OEROOT##/meta-poky \
-  ##OEROOT##/import-layers/meta-openembedded/meta-oe \
-  ##OEROOT##/import-layers/meta-openembedded/meta-networking \
-  ##OEROOT##/import-layers/meta-openembedded/meta-perl \
-  ##OEROOT##/import-layers/meta-openembedded/meta-python \
-  ##OEROOT##/import-layers/meta-openembedded/meta-webserver \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-perl \
+  ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-openpower \
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-z/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-z/conf/bblayers.conf.sample
index bab8a2c..cb42c63 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-z/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-z/conf/bblayers.conf.sample
@@ -8,11 +8,11 @@
 BBLAYERS ?= " \
   ##OEROOT##/meta \
   ##OEROOT##/meta-poky \
-  ##OEROOT##/import-layers/meta-openembedded/meta-oe/   \
-  ##OEROOT##/import-layers/meta-openembedded/meta-filesystems/   \
-  ##OEROOT##/import-layers/meta-openembedded/meta-networking/   \
-  ##OEROOT##/import-layers/meta-openembedded/meta-python/   \
-  ##OEROOT##/import-layers/meta-openembedded/meta-webserver \
+  ##OEROOT##/meta-openembedded/meta-oe/   \
+  ##OEROOT##/meta-openembedded/meta-filesystems/   \
+  ##OEROOT##/meta-openembedded/meta-networking/   \
+  ##OEROOT##/meta-openembedded/meta-python/   \
+  ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-openbmc-bsp/meta-ibm/meta-fsp2 \
   ##OEROOT##/meta-openbmc-machines/meta-openpower \
diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample
index d550426..e153a4b 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/conf/bblayers.conf.sample
@@ -8,11 +8,11 @@
 BBLAYERS ?= " \
   ##OEROOT##/meta \
   ##OEROOT##/meta-poky \
-  ##OEROOT##/import-layers/meta-openembedded/meta-oe \
-  ##OEROOT##/import-layers/meta-openembedded/meta-networking \
-  ##OEROOT##/import-layers/meta-openembedded/meta-perl \
-  ##OEROOT##/import-layers/meta-openembedded/meta-python \
-  ##OEROOT##/import-layers/meta-openembedded/meta-webserver \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-perl \
+  ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-openpower \
@@ -22,11 +22,11 @@
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
   ##OEROOT##/meta-poky \
-  ##OEROOT##/import-layers/meta-openembedded/meta-oe \
-  ##OEROOT##/import-layers/meta-openembedded/meta-networking \
-  ##OEROOT##/import-layers/meta-openembedded/meta-perl \
-  ##OEROOT##/import-layers/meta-openembedded/meta-python \
-  ##OEROOT##/import-layers/meta-openembedded/meta-webserver \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-perl \
+  ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-openpower \
diff --git a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/conf/bblayers.conf.sample
index baddd56..5884868 100644
--- a/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-openpower/meta-inventec/meta-lanyang/conf/bblayers.conf.sample
@@ -8,10 +8,10 @@
 BBLAYERS ?= " \
   ##OEROOT##/meta \
   ##OEROOT##/meta-poky \
-  ##OEROOT##/import-layers/meta-openembedded/meta-oe \
-  ##OEROOT##/import-layers/meta-openembedded/meta-networking \
-  ##OEROOT##/import-layers/meta-openembedded/meta-perl \
-  ##OEROOT##/import-layers/meta-openembedded/meta-python \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-perl \
+  ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-openpower \
@@ -21,10 +21,10 @@
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
   ##OEROOT##/meta-poky \
-  ##OEROOT##/import-layers/meta-openembedded/meta-oe \
-  ##OEROOT##/import-layers/meta-openembedded/meta-networking \
-  ##OEROOT##/import-layers/meta-openembedded/meta-perl \
-  ##OEROOT##/import-layers/meta-openembedded/meta-python \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-perl \
+  ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-openpower \
diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample
index e3c6dac..2a4140f 100644
--- a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/conf/bblayers.conf.sample
@@ -8,11 +8,11 @@
 BBLAYERS ?= " \
   ##OEROOT##/meta \
   ##OEROOT##/meta-poky \
-  ##OEROOT##/import-layers/meta-openembedded/meta-oe \
-  ##OEROOT##/import-layers/meta-openembedded/meta-networking \
-  ##OEROOT##/import-layers/meta-openembedded/meta-perl \
-  ##OEROOT##/import-layers/meta-openembedded/meta-python \
-  ##OEROOT##/import-layers/meta-openembedded/meta-webserver \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-perl \
+  ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-openpower \
@@ -22,11 +22,11 @@
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
   ##OEROOT##/meta-poky \
-  ##OEROOT##/import-layers/meta-openembedded/meta-oe \
-  ##OEROOT##/import-layers/meta-openembedded/meta-networking \
-  ##OEROOT##/import-layers/meta-openembedded/meta-perl \
-  ##OEROOT##/import-layers/meta-openembedded/meta-python \
-  ##OEROOT##/import-layers/meta-openembedded/meta-webserver \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-perl \
+  ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-openpower \
diff --git a/meta-openbmc-machines/meta-x86/meta-intel/meta-s2600wf/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-x86/meta-intel/meta-s2600wf/conf/bblayers.conf.sample
index 586bf2f..3c231c7 100644
--- a/meta-openbmc-machines/meta-x86/meta-intel/meta-s2600wf/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-x86/meta-intel/meta-s2600wf/conf/bblayers.conf.sample
@@ -8,11 +8,11 @@
 BBLAYERS ?= " \
   ##OEROOT##/meta \
   ##OEROOT##/meta-poky \
-  ##OEROOT##/import-layers/meta-openembedded/meta-oe \
-  ##OEROOT##/import-layers/meta-openembedded/meta-networking \
-  ##OEROOT##/import-layers/meta-openembedded/meta-perl \
-  ##OEROOT##/import-layers/meta-openembedded/meta-python \
-  ##OEROOT##/import-layers/meta-openembedded/meta-webserver \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-perl \
+  ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-x86 \
diff --git a/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn/conf/bblayers.conf.sample
index d0da209..7bc1aa2 100644
--- a/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-x86/meta-mellanox/meta-msn/conf/bblayers.conf.sample
@@ -8,11 +8,11 @@
 BBLAYERS ?= " \
   ##OEROOT##/meta \
   ##OEROOT##/meta-poky \
-  ##OEROOT##/import-layers/meta-openembedded/meta-oe \
-  ##OEROOT##/import-layers/meta-openembedded/meta-networking \
-  ##OEROOT##/import-layers/meta-openembedded/meta-perl \
-  ##OEROOT##/import-layers/meta-openembedded/meta-python \
-  ##OEROOT##/import-layers/meta-openembedded/meta-webserver \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-perl \
+  ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-x86 \
@@ -22,11 +22,11 @@
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
   ##OEROOT##/meta-poky \
-  ##OEROOT##/import-layers/meta-openembedded/meta-oe \
-  ##OEROOT##/import-layers/meta-openembedded/meta-networking \
-  ##OEROOT##/import-layers/meta-openembedded/meta-perl \
-  ##OEROOT##/import-layers/meta-openembedded/meta-python \
-  ##OEROOT##/import-layers/meta-openembedded/meta-webserver \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-perl \
+  ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-x86 \
diff --git a/meta-openbmc-machines/meta-x86/meta-portwell/meta-neptune/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-x86/meta-portwell/meta-neptune/conf/bblayers.conf.sample
index 8e9c81d..9726491 100644
--- a/meta-openbmc-machines/meta-x86/meta-portwell/meta-neptune/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-x86/meta-portwell/meta-neptune/conf/bblayers.conf.sample
@@ -8,11 +8,11 @@
 BBLAYERS ?= " \
   ##OEROOT##/meta \
   ##OEROOT##/meta-poky \
-  ##OEROOT##/import-layers/meta-openembedded/meta-oe \
-  ##OEROOT##/import-layers/meta-openembedded/meta-networking \
-  ##OEROOT##/import-layers/meta-openembedded/meta-perl \
-  ##OEROOT##/import-layers/meta-openembedded/meta-python \
-  ##OEROOT##/import-layers/meta-openembedded/meta-webserver \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-perl \
+  ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-x86/meta-portwell/meta-neptune \
diff --git a/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/conf/bblayers.conf.sample b/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/conf/bblayers.conf.sample
index 94effa2..874a472 100644
--- a/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/conf/bblayers.conf.sample
+++ b/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/conf/bblayers.conf.sample
@@ -8,11 +8,11 @@
 BBLAYERS ?= " \
   ##OEROOT##/meta \
   ##OEROOT##/meta-poky \
-  ##OEROOT##/import-layers/meta-openembedded/meta-oe \
-  ##OEROOT##/import-layers/meta-openembedded/meta-networking \
-  ##OEROOT##/import-layers/meta-openembedded/meta-perl \
-  ##OEROOT##/import-layers/meta-openembedded/meta-python \
-  ##OEROOT##/import-layers/meta-openembedded/meta-webserver \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-perl \
+  ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-x86 \
@@ -22,11 +22,11 @@
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
   ##OEROOT##/meta-poky \
-  ##OEROOT##/import-layers/meta-openembedded/meta-oe \
-  ##OEROOT##/import-layers/meta-openembedded/meta-networking \
-  ##OEROOT##/import-layers/meta-openembedded/meta-perl \
-  ##OEROOT##/import-layers/meta-openembedded/meta-python \
-  ##OEROOT##/import-layers/meta-openembedded/meta-webserver \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-perl \
+  ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-openbmc-bsp/meta-aspeed \
   ##OEROOT##/meta-openbmc-machines/meta-x86 \
diff --git a/import-layers/meta-openembedded/.gitignore b/meta-openembedded/.gitignore
similarity index 100%
rename from import-layers/meta-openembedded/.gitignore
rename to meta-openembedded/.gitignore
diff --git a/import-layers/meta-openembedded/COPYING.MIT b/meta-openembedded/COPYING.MIT
similarity index 100%
rename from import-layers/meta-openembedded/COPYING.MIT
rename to meta-openembedded/COPYING.MIT
diff --git a/import-layers/meta-openembedded/README b/meta-openembedded/README
similarity index 100%
rename from import-layers/meta-openembedded/README
rename to meta-openembedded/README
diff --git a/import-layers/meta-openembedded/contrib/oe-stylize.py b/meta-openembedded/contrib/oe-stylize.py
similarity index 100%
rename from import-layers/meta-openembedded/contrib/oe-stylize.py
rename to meta-openembedded/contrib/oe-stylize.py
diff --git a/import-layers/meta-openembedded/contrib/pw-am.sh b/meta-openembedded/contrib/pw-am.sh
similarity index 100%
rename from import-layers/meta-openembedded/contrib/pw-am.sh
rename to meta-openembedded/contrib/pw-am.sh
diff --git a/import-layers/meta-openembedded/meta-filesystems/COPYING.MIT b/meta-openembedded/meta-filesystems/COPYING.MIT
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/COPYING.MIT
rename to meta-openembedded/meta-filesystems/COPYING.MIT
diff --git a/import-layers/meta-openembedded/meta-filesystems/README b/meta-openembedded/meta-filesystems/README
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/README
rename to meta-openembedded/meta-filesystems/README
diff --git a/import-layers/meta-openembedded/meta-filesystems/conf/layer.conf b/meta-openembedded/meta-filesystems/conf/layer.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/conf/layer.conf
rename to meta-openembedded/meta-filesystems/conf/layer.conf
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/fuse-exfat/fuse-exfat_1.2.3.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/fuse-exfat/fuse-exfat_1.2.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/fuse-exfat/fuse-exfat_1.2.3.bb
rename to meta-openembedded/meta-filesystems/recipes-filesystems/fuse-exfat/fuse-exfat_1.2.3.bb
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/ifuse/ifuse_1.1.2.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/ifuse/ifuse_1.1.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/ifuse/ifuse_1.1.2.bb
rename to meta-openembedded/meta-filesystems/recipes-filesystems/ifuse/ifuse_1.1.2.bb
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-Add-LDFLAGS-to-linker-cmdline.patch b/meta-openembedded/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-Add-LDFLAGS-to-linker-cmdline.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-Add-LDFLAGS-to-linker-cmdline.patch
rename to meta-openembedded/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-Add-LDFLAGS-to-linker-cmdline.patch
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-btree-Avoid-conflicts-with-libc-namespace-about-setk.patch b/meta-openembedded/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-btree-Avoid-conflicts-with-libc-namespace-about-setk.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-btree-Avoid-conflicts-with-libc-namespace-about-setk.patch
rename to meta-openembedded/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-btree-Avoid-conflicts-with-libc-namespace-about-setk.patch
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb
rename to meta-openembedded/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/0001-libntfs-3g-Makefile.am-fix-install-failed-while-host.patch b/meta-openembedded/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/0001-libntfs-3g-Makefile.am-fix-install-failed-while-host.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/0001-libntfs-3g-Makefile.am-fix-install-failed-while-host.patch
rename to meta-openembedded/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/files/0001-libntfs-3g-Makefile.am-fix-install-failed-while-host.patch
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb
rename to meta-openembedded/meta-filesystems/recipes-filesystems/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2017.3.23.bb
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs/owhttpd b/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs/owhttpd
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs/owhttpd
rename to meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs/owhttpd
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs/owserver b/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs/owserver
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs/owserver
rename to meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs/owserver
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs_2.9p1.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs_2.9p1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs_2.9p1.bb
rename to meta-openembedded/meta-filesystems/recipes-filesystems/owfs/owfs_2.9p1.bb
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/simple-mtpfs/simple-mtpfs_git.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/simple-mtpfs/simple-mtpfs_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/simple-mtpfs/simple-mtpfs_git.bb
rename to meta-openembedded/meta-filesystems/recipes-filesystems/simple-mtpfs/simple-mtpfs_git.bb
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch b/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch
rename to meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch b/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch
rename to meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb
rename to meta-openembedded/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/files/0001-Makefile-fix-path-for-sshfs.1.patch b/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/files/0001-Makefile-fix-path-for-sshfs.1.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/files/0001-Makefile-fix-path-for-sshfs.1.patch
rename to meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/files/0001-Makefile-fix-path-for-sshfs.1.patch
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.8.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.8.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.8.bb
rename to meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.8.bb
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/unionfs-fuse/files/0001-support-cross-compiling.patch b/meta-openembedded/meta-filesystems/recipes-filesystems/unionfs-fuse/files/0001-support-cross-compiling.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/unionfs-fuse/files/0001-support-cross-compiling.patch
rename to meta-openembedded/meta-filesystems/recipes-filesystems/unionfs-fuse/files/0001-support-cross-compiling.patch
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/unionfs-fuse/files/0001-unionfs-Define-IOCPARM_LEN-if-undefined.patch b/meta-openembedded/meta-filesystems/recipes-filesystems/unionfs-fuse/files/0001-unionfs-Define-IOCPARM_LEN-if-undefined.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/unionfs-fuse/files/0001-unionfs-Define-IOCPARM_LEN-if-undefined.patch
rename to meta-openembedded/meta-filesystems/recipes-filesystems/unionfs-fuse/files/0001-unionfs-Define-IOCPARM_LEN-if-undefined.patch
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_2.0.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_2.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_2.0.bb
rename to meta-openembedded/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_2.0.bb
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0001-define-loff_t-if-not-already-defined.patch b/meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0001-define-loff_t-if-not-already-defined.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0001-define-loff_t-if-not-already-defined.patch
rename to meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/0001-define-loff_t-if-not-already-defined.patch
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/makefile-add-ldflags.patch b/meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/makefile-add-ldflags.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/makefile-add-ldflags.patch
rename to meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/makefile-add-ldflags.patch
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb
rename to meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-support/fuse/files/0001-fuse-fix-the-return-value-of-help-option.patch b/meta-openembedded/meta-filesystems/recipes-support/fuse/files/0001-fuse-fix-the-return-value-of-help-option.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-support/fuse/files/0001-fuse-fix-the-return-value-of-help-option.patch
rename to meta-openembedded/meta-filesystems/recipes-support/fuse/files/0001-fuse-fix-the-return-value-of-help-option.patch
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-support/fuse/files/aarch64.patch b/meta-openembedded/meta-filesystems/recipes-support/fuse/files/aarch64.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-support/fuse/files/aarch64.patch
rename to meta-openembedded/meta-filesystems/recipes-support/fuse/files/aarch64.patch
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-support/fuse/files/fuse.conf b/meta-openembedded/meta-filesystems/recipes-support/fuse/files/fuse.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-support/fuse/files/fuse.conf
rename to meta-openembedded/meta-filesystems/recipes-support/fuse/files/fuse.conf
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-support/fuse/files/gold-unversioned-symbol.patch b/meta-openembedded/meta-filesystems/recipes-support/fuse/files/gold-unversioned-symbol.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-support/fuse/files/gold-unversioned-symbol.patch
rename to meta-openembedded/meta-filesystems/recipes-support/fuse/files/gold-unversioned-symbol.patch
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse_2.9.7.bb b/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse_2.9.7.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse_2.9.7.bb
rename to meta-openembedded/meta-filesystems/recipes-support/fuse/fuse_2.9.7.bb
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-support/physfs/physfs_2.0.3.bb b/meta-openembedded/meta-filesystems/recipes-support/physfs/physfs_2.0.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-support/physfs/physfs_2.0.3.bb
rename to meta-openembedded/meta-filesystems/recipes-support/physfs/physfs_2.0.3.bb
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util/0001-libau-Define-STRIP-weakly.patch b/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util/0001-libau-Define-STRIP-weakly.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util/0001-libau-Define-STRIP-weakly.patch
rename to meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util/0001-libau-Define-STRIP-weakly.patch
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util/aufs-util-add-tool-concept-to-Makefile-for-cross-com.patch b/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util/aufs-util-add-tool-concept-to-Makefile-for-cross-com.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util/aufs-util-add-tool-concept-to-Makefile-for-cross-com.patch
rename to meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util/aufs-util-add-tool-concept-to-Makefile-for-cross-com.patch
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util/aufs-util-don-t-strip-executables.patch b/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util/aufs-util-don-t-strip-executables.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util/aufs-util-don-t-strip-executables.patch
rename to meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util/aufs-util-don-t-strip-executables.patch
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb b/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb
rename to meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/exfat-utils/exfat-utils_1.2.3.bb b/meta-openembedded/meta-filesystems/recipes-utils/exfat-utils/exfat-utils_1.2.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-utils/exfat-utils/exfat-utils_1.2.3.bb
rename to meta-openembedded/meta-filesystems/recipes-utils/exfat-utils/exfat-utils_1.2.3.bb
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-Remove-AC_CHECK_FILE-for-cross-compilation.patch b/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-Remove-AC_CHECK_FILE-for-cross-compilation.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-Remove-AC_CHECK_FILE-for-cross-compilation.patch
rename to meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-Remove-AC_CHECK_FILE-for-cross-compilation.patch
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0002-Fix-mkfs-out-of-tree-builds.patch b/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0002-Fix-mkfs-out-of-tree-builds.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0002-Fix-mkfs-out-of-tree-builds.patch
rename to meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0002-Fix-mkfs-out-of-tree-builds.patch
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.8.0.bb b/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.8.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.8.0.bb
rename to meta-openembedded/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.8.0.bb
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/udevil/files/0001-udevil-0.4.3-fix-compile-with-gcc6.patch b/meta-openembedded/meta-filesystems/recipes-utils/udevil/files/0001-udevil-0.4.3-fix-compile-with-gcc6.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-utils/udevil/files/0001-udevil-0.4.3-fix-compile-with-gcc6.patch
rename to meta-openembedded/meta-filesystems/recipes-utils/udevil/files/0001-udevil-0.4.3-fix-compile-with-gcc6.patch
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/udevil/files/0002-etc-Makefile.am-Use-systemd_unitdir-instead-of-libdi.patch b/meta-openembedded/meta-filesystems/recipes-utils/udevil/files/0002-etc-Makefile.am-Use-systemd_unitdir-instead-of-libdi.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-utils/udevil/files/0002-etc-Makefile.am-Use-systemd_unitdir-instead-of-libdi.patch
rename to meta-openembedded/meta-filesystems/recipes-utils/udevil/files/0002-etc-Makefile.am-Use-systemd_unitdir-instead-of-libdi.patch
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/udevil/udevil_0.4.4.bb b/meta-openembedded/meta-filesystems/recipes-utils/udevil/udevil_0.4.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-utils/udevil/udevil_0.4.4.bb
rename to meta-openembedded/meta-filesystems/recipes-utils/udevil/udevil_0.4.4.bb
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0001-Include-fcntl.h-for-O_EXCL.patch b/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0001-Include-fcntl.h-for-O_EXCL.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0001-Include-fcntl.h-for-O_EXCL.patch
rename to meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0001-Include-fcntl.h-for-O_EXCL.patch
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-Use-c99-defined-int64_t-instead-of-__int64_t.patch b/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-Use-c99-defined-int64_t-instead-of-__int64_t.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-Use-c99-defined-int64_t-instead-of-__int64_t.patch
rename to meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0001-xfsdump-Use-c99-defined-int64_t-instead-of-__int64_t.patch
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0002-Replace-__uint32_t-with-uint32_t.patch b/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0002-Replace-__uint32_t-with-uint32_t.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0002-Replace-__uint32_t-with-uint32_t.patch
rename to meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0002-Replace-__uint32_t-with-uint32_t.patch
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0003-replace-use-of-SIGCLD-with-SIGCHLD.patch b/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0003-replace-use-of-SIGCLD-with-SIGCHLD.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0003-replace-use-of-SIGCLD-with-SIGCHLD.patch
rename to meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0003-replace-use-of-SIGCLD-with-SIGCHLD.patch
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0004-include-limit.h-for-PATH_MAX.patch b/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0004-include-limit.h-for-PATH_MAX.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0004-include-limit.h-for-PATH_MAX.patch
rename to meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0004-include-limit.h-for-PATH_MAX.patch
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0005-include-sys-types.h-for-u_int32_t-in-attr-attributes.patch b/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0005-include-sys-types.h-for-u_int32_t-in-attr-attributes.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0005-include-sys-types.h-for-u_int32_t-in-attr-attributes.patch
rename to meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/0005-include-sys-types.h-for-u_int32_t-in-attr-attributes.patch
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/remove-install-as-user.patch b/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/remove-install-as-user.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/remove-install-as-user.patch
rename to meta-openembedded/meta-filesystems/recipes-utils/xfsdump/files/remove-install-as-user.patch
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.7.bb b/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.7.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.7.bb
rename to meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.7.bb
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/0001-build-Check-for-sync_file_range-libc-function.patch b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/0001-build-Check-for-sync_file_range-libc-function.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/0001-build-Check-for-sync_file_range-libc-function.patch
rename to meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/0001-build-Check-for-sync_file_range-libc-function.patch
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/remove_flags_from_build_flags.patch b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/remove_flags_from_build_flags.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/remove_flags_from_build_flags.patch
rename to meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/files/remove_flags_from_build_flags.patch
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.14.0.bb b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.14.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.14.0.bb
rename to meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.14.0.bb
diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xorriso/xorriso_1.4.0.bb b/meta-openembedded/meta-filesystems/recipes-utils/xorriso/xorriso_1.4.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-filesystems/recipes-utils/xorriso/xorriso_1.4.0.bb
rename to meta-openembedded/meta-filesystems/recipes-utils/xorriso/xorriso_1.4.0.bb
diff --git a/import-layers/meta-openembedded/meta-gnome/COPYING.MIT b/meta-openembedded/meta-gnome/COPYING.MIT
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/COPYING.MIT
rename to meta-openembedded/meta-gnome/COPYING.MIT
diff --git a/import-layers/meta-openembedded/meta-gnome/README b/meta-openembedded/meta-gnome/README
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/README
rename to meta-openembedded/meta-gnome/README
diff --git a/import-layers/meta-openembedded/meta-gnome/classes/sanity-meta-gnome.bbclass b/meta-openembedded/meta-gnome/classes/sanity-meta-gnome.bbclass
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/classes/sanity-meta-gnome.bbclass
rename to meta-openembedded/meta-gnome/classes/sanity-meta-gnome.bbclass
diff --git a/import-layers/meta-openembedded/meta-gnome/conf/layer.conf b/meta-openembedded/meta-gnome/conf/layer.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/conf/layer.conf
rename to meta-openembedded/meta-gnome/conf/layer.conf
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb b/meta-openembedded/meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb
rename to meta-openembedded/meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.10.bb b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.10.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.10.bb
rename to meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.8.10.bb
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-connectivity/obex/obexd/ssize_t_definition.patch b/meta-openembedded/meta-gnome/recipes-connectivity/obex/obexd/ssize_t_definition.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-connectivity/obex/obexd/ssize_t_definition.patch
rename to meta-openembedded/meta-gnome/recipes-connectivity/obex/obexd/ssize_t_definition.patch
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb b/meta-openembedded/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb
rename to meta-openembedded/meta-gnome/recipes-connectivity/obex/obexd_0.48.bb
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3/0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch b/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3/0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3/0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch
rename to meta-openembedded/meta-gnome/recipes-devtools/glade/glade3/0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch b/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch
rename to meta-openembedded/meta-gnome/recipes-devtools/glade/glade3/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch b/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch
rename to meta-openembedded/meta-gnome/recipes-devtools/glade/glade3/0002-fix-gcc-6-build.patch
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3_3.8.5.bb b/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3_3.8.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-devtools/glade/glade3_3.8.5.bb
rename to meta-openembedded/meta-gnome/recipes-devtools/glade/glade3_3.8.5.bb
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-extended/gparted/files/gparted_polkit b/meta-openembedded/meta-gnome/recipes-extended/gparted/files/gparted_polkit
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-extended/gparted/files/gparted_polkit
rename to meta-openembedded/meta-gnome/recipes-extended/gparted/files/gparted_polkit
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-extended/gparted/files/org.yoctoproject.pkexec.run-gparted.policy b/meta-openembedded/meta-gnome/recipes-extended/gparted/files/org.yoctoproject.pkexec.run-gparted.policy
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-extended/gparted/files/org.yoctoproject.pkexec.run-gparted.policy
rename to meta-openembedded/meta-gnome/recipes-extended/gparted/files/org.yoctoproject.pkexec.run-gparted.policy
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_0.31.0.bb b/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_0.31.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_0.31.0.bb
rename to meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_0.31.0.bb
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword/0001-plugins-aiksaurus-Makefile.am-remove-uncomplete-opti.patch b/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword/0001-plugins-aiksaurus-Makefile.am-remove-uncomplete-opti.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword/0001-plugins-aiksaurus-Makefile.am-remove-uncomplete-opti.patch
rename to meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword/0001-plugins-aiksaurus-Makefile.am-remove-uncomplete-opti.patch
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword_3.0.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword_3.0.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword_3.0.2.bb
rename to meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword_3.0.2.bb
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb
rename to meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/desktop-file-utils/desktop-file-utils_0.18.bb b/meta-openembedded/meta-gnome/recipes-gnome/desktop-file-utils/desktop-file-utils_0.18.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/desktop-file-utils/desktop-file-utils_0.18.bb
rename to meta-openembedded/meta-gnome/recipes-gnome/desktop-file-utils/desktop-file-utils_0.18.bb
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/devilspie/devilspie2_0.43.bb b/meta-openembedded/meta-gnome/recipes-gnome/devilspie/devilspie2_0.43.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/devilspie/devilspie2_0.43.bb
rename to meta-openembedded/meta-gnome/recipes-gnome/devilspie/devilspie2_0.43.bb
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/devilspie/files/default.lua b/meta-openembedded/meta-gnome/recipes-gnome/devilspie/files/default.lua
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/devilspie/files/default.lua
rename to meta-openembedded/meta-gnome/recipes-gnome/devilspie/files/default.lua
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/devilspie/files/devilspie2.desktop b/meta-openembedded/meta-gnome/recipes-gnome/devilspie/files/devilspie2.desktop
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/devilspie/files/devilspie2.desktop
rename to meta-openembedded/meta-gnome/recipes-gnome/devilspie/files/devilspie2.desktop
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
rename to meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch
rename to meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch
rename to meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/0003-contact-Replace-the-Novell-sample-contact-with-somet.patch
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/iconv-detect.h b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/iconv-detect.h
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/iconv-detect.h
rename to meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server/iconv-detect.h
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server_3.26.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server_3.26.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server_3.26.3.bb
rename to meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server_3.26.3.bb
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0001-Add-format-attribute-to-_synctex_malloc.patch b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0001-Add-format-attribute-to-_synctex_malloc.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0001-Add-format-attribute-to-_synctex_malloc.patch
rename to meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0001-Add-format-attribute-to-_synctex_malloc.patch
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0001-help-remove-YELP-macro.patch b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0001-help-remove-YELP-macro.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0001-help-remove-YELP-macro.patch
rename to meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0001-help-remove-YELP-macro.patch
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.24.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.24.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.24.0.bb
rename to meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.24.0.bb
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/faenza-icon-theme/faenza-icon-theme_1.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/faenza-icon-theme/faenza-icon-theme_1.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/faenza-icon-theme/faenza-icon-theme_1.3.bb
rename to meta-openembedded/meta-gnome/recipes-gnome/faenza-icon-theme/faenza-icon-theme_1.3.bb
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-Remove-help-directory-from-build.patch b/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-Remove-help-directory-from-build.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-Remove-help-directory-from-build.patch
rename to meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-Remove-help-directory-from-build.patch
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-gedit-utils-qualify-handle_builder_error-with-format.patch b/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-gedit-utils-qualify-handle_builder_error-with-format.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-gedit-utils-qualify-handle_builder_error-with-format.patch
rename to meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-gedit-utils-qualify-handle_builder_error-with-format.patch
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-tests-document-saver.c-Define-ACCESSPERMS-if-not-def.patch b/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-tests-document-saver.c-Define-ACCESSPERMS-if-not-def.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-tests-document-saver.c-Define-ACCESSPERMS-if-not-def.patch
rename to meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-tests-document-saver.c-Define-ACCESSPERMS-if-not-def.patch
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-workaround-void-pointer-arithmetic.patch b/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-workaround-void-pointer-arithmetic.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-workaround-void-pointer-arithmetic.patch
rename to meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-workaround-void-pointer-arithmetic.patch
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0002-suppress-string-format-literal-warning-to-fix-build-.patch b/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0002-suppress-string-format-literal-warning-to-fix-build-.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0002-suppress-string-format-literal-warning-to-fix-build-.patch
rename to meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0002-suppress-string-format-literal-warning-to-fix-build-.patch
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb
rename to meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.18.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.18.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.18.2.bb
rename to meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.18.2.bb
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/musl.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/musl.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/musl.patch
rename to meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/musl.patch
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.20.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.20.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.20.0.bb
rename to meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.20.0.bb
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/libgnome-keyring_3.12.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/libgnome-keyring_3.12.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/libgnome-keyring_3.12.0.bb
rename to meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/libgnome-keyring_3.12.0.bb
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb
rename to meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/files/0001-help-remove-YELP-macro.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/files/0001-help-remove-YELP-macro.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/files/0001-help-remove-YELP-macro.patch
rename to meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/files/0001-help-remove-YELP-macro.patch
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.26.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.26.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.26.0.bb
rename to meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.26.0.bb
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light/classic-light.xml b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light/classic-light.xml
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light/classic-light.xml
rename to meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light/classic-light.xml
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb
rename to meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/0001-test-widget.c-fix-non-literal-format-string-issues.patch b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/0001-test-widget.c-fix-non-literal-format-string-issues.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/0001-test-widget.c-fix-non-literal-format-string-issues.patch
rename to meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/0001-test-widget.c-fix-non-literal-format-string-issues.patch
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/acinclude.m4 b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/acinclude.m4
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/acinclude.m4
rename to meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/acinclude.m4
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/gtk-doc.m4 b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/gtk-doc.m4
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/gtk-doc.m4
rename to meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/gtk-doc.m4
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/gtk-doc.make b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/gtk-doc.make
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/gtk-doc.make
rename to meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/gtk-doc.make
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/suppress-string-format-literal-warning.patch b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/suppress-string-format-literal-warning.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/suppress-string-format-literal-warning.patch
rename to meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/suppress-string-format-literal-warning.patch
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2_2.10.5.bb b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2_2.10.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2_2.10.5.bb
rename to meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2_2.10.5.bb
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.6.bb b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.6.bb
rename to meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.6.bb
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.36.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.36.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.36.0.bb
rename to meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.36.0.bb
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.16.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.16.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.16.1.bb
rename to meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.16.1.bb
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.22.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.22.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.22.0.bb
rename to meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.22.0.bb
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgsf/files/0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch b/meta-openembedded/meta-gnome/recipes-gnome/libgsf/files/0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgsf/files/0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch
rename to meta-openembedded/meta-gnome/recipes-gnome/libgsf/files/0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.29.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.29.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.29.bb
rename to meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.29.bb
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgtkstylus/files/gtkstylus.sh b/meta-openembedded/meta-gnome/recipes-gnome/libgtkstylus/files/gtkstylus.sh
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgtkstylus/files/gtkstylus.sh
rename to meta-openembedded/meta-gnome/recipes-gnome/libgtkstylus/files/gtkstylus.sh
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb
rename to meta-openembedded/meta-gnome/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop/0001-netload-Include-libc-net-headers-unconditionally.patch b/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop/0001-netload-Include-libc-net-headers-unconditionally.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop/0001-netload-Include-libc-net-headers-unconditionally.patch
rename to meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop/0001-netload-Include-libc-net-headers-unconditionally.patch
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop_2.38.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop_2.38.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop_2.38.0.bb
rename to meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop_2.38.0.bb
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.5.bb b/meta-openembedded/meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.5.bb
rename to meta-openembedded/meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.5.bb
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_3.20.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_3.20.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_3.20.1.bb
rename to meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_3.20.1.bb
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb
rename to meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/files/fix-do_installe-failure.patch b/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/files/fix-do_installe-failure.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/files/fix-do_installe-failure.patch
rename to meta-openembedded/meta-gnome/recipes-gnome/libxklavier/files/fix-do_installe-failure.patch
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb
rename to meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity/0001-drop-zenity-detection.patch b/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity/0001-drop-zenity-detection.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity/0001-drop-zenity-detection.patch
rename to meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity/0001-drop-zenity-detection.patch
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.38.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.38.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.38.0.bb
rename to meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.38.0.bb
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_3.18.5.bb b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_3.18.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_3.18.5.bb
rename to meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_3.18.5.bb
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/wv/wv-1.2.4/0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch b/meta-openembedded/meta-gnome/recipes-gnome/wv/wv-1.2.4/0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/wv/wv-1.2.4/0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch
rename to meta-openembedded/meta-gnome/recipes-gnome/wv/wv-1.2.4/0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/wv/wv-1.2.4/0001-wvRTF.c-Specify-print-format-in-rtf_output.patch b/meta-openembedded/meta-gnome/recipes-gnome/wv/wv-1.2.4/0001-wvRTF.c-Specify-print-format-in-rtf_output.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/wv/wv-1.2.4/0001-wvRTF.c-Specify-print-format-in-rtf_output.patch
rename to meta-openembedded/meta-gnome/recipes-gnome/wv/wv-1.2.4/0001-wvRTF.c-Specify-print-format-in-rtf_output.patch
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/wv/wv-1.2.4/pkgconfig.patch b/meta-openembedded/meta-gnome/recipes-gnome/wv/wv-1.2.4/pkgconfig.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/wv/wv-1.2.4/pkgconfig.patch
rename to meta-openembedded/meta-gnome/recipes-gnome/wv/wv-1.2.4/pkgconfig.patch
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/wv/wv_1.2.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/wv/wv_1.2.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/wv/wv_1.2.4.bb
rename to meta-openembedded/meta-gnome/recipes-gnome/wv/wv_1.2.4.bb
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-support/keybinder/keybinder_3.0.bb b/meta-openembedded/meta-gnome/recipes-support/keybinder/keybinder_3.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-support/keybinder/keybinder_3.0.bb
rename to meta-openembedded/meta-gnome/recipes-support/keybinder/keybinder_3.0.bb
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch b/meta-openembedded/meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch
rename to meta-openembedded/meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb b/meta-openembedded/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb
rename to meta-openembedded/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-support/usermode/usermode/0001-Makefile.am-Link-with-libm-for-powl-API.patch b/meta-openembedded/meta-gnome/recipes-support/usermode/usermode/0001-Makefile.am-Link-with-libm-for-powl-API.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-support/usermode/usermode/0001-Makefile.am-Link-with-libm-for-powl-API.patch
rename to meta-openembedded/meta-gnome/recipes-support/usermode/usermode/0001-Makefile.am-Link-with-libm-for-powl-API.patch
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-support/usermode/usermode/0001-fix-compile-failure-against-musl-C-library.patch b/meta-openembedded/meta-gnome/recipes-support/usermode/usermode/0001-fix-compile-failure-against-musl-C-library.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-support/usermode/usermode/0001-fix-compile-failure-against-musl-C-library.patch
rename to meta-openembedded/meta-gnome/recipes-support/usermode/usermode/0001-fix-compile-failure-against-musl-C-library.patch
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-support/usermode/usermode/0001-formatting-issues.patch b/meta-openembedded/meta-gnome/recipes-support/usermode/usermode/0001-formatting-issues.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-support/usermode/usermode/0001-formatting-issues.patch
rename to meta-openembedded/meta-gnome/recipes-support/usermode/usermode/0001-formatting-issues.patch
diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-support/usermode/usermode_1.111.bb b/meta-openembedded/meta-gnome/recipes-support/usermode/usermode_1.111.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/recipes-support/usermode/usermode_1.111.bb
rename to meta-openembedded/meta-gnome/recipes-support/usermode/usermode_1.111.bb
diff --git a/import-layers/meta-openembedded/meta-gnome/site/arm-64 b/meta-openembedded/meta-gnome/site/arm-64
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/site/arm-64
rename to meta-openembedded/meta-gnome/site/arm-64
diff --git a/import-layers/meta-openembedded/meta-gnome/site/riscv64-linux b/meta-openembedded/meta-gnome/site/riscv64-linux
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/site/riscv64-linux
rename to meta-openembedded/meta-gnome/site/riscv64-linux
diff --git a/import-layers/meta-openembedded/meta-gnome/site/x86_64-linux b/meta-openembedded/meta-gnome/site/x86_64-linux
similarity index 100%
rename from import-layers/meta-openembedded/meta-gnome/site/x86_64-linux
rename to meta-openembedded/meta-gnome/site/x86_64-linux
diff --git a/import-layers/meta-openembedded/meta-initramfs/COPYING.MIT b/meta-openembedded/meta-initramfs/COPYING.MIT
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/COPYING.MIT
rename to meta-openembedded/meta-initramfs/COPYING.MIT
diff --git a/import-layers/meta-openembedded/meta-initramfs/README b/meta-openembedded/meta-initramfs/README
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/README
rename to meta-openembedded/meta-initramfs/README
diff --git a/import-layers/meta-openembedded/meta-initramfs/classes/klibc.bbclass b/meta-openembedded/meta-initramfs/classes/klibc.bbclass
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/classes/klibc.bbclass
rename to meta-openembedded/meta-initramfs/classes/klibc.bbclass
diff --git a/import-layers/meta-openembedded/meta-initramfs/conf/layer.conf b/meta-openembedded/meta-initramfs/conf/layer.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/conf/layer.conf
rename to meta-openembedded/meta-initramfs/conf/layer.conf
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-bsp/images/initramfs-debug-image.bb b/meta-openembedded/meta-initramfs/recipes-bsp/images/initramfs-debug-image.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-bsp/images/initramfs-debug-image.bb
rename to meta-openembedded/meta-initramfs/recipes-bsp/images/initramfs-debug-image.bb
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-bsp/images/initramfs-kexecboot-image.bb b/meta-openembedded/meta-initramfs/recipes-bsp/images/initramfs-kexecboot-image.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-bsp/images/initramfs-kexecboot-image.bb
rename to meta-openembedded/meta-initramfs/recipes-bsp/images/initramfs-kexecboot-image.bb
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-bsp/images/initramfs-kexecboot-klibc-image.bb b/meta-openembedded/meta-initramfs/recipes-bsp/images/initramfs-kexecboot-klibc-image.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-bsp/images/initramfs-kexecboot-klibc-image.bb
rename to meta-openembedded/meta-initramfs/recipes-bsp/images/initramfs-kexecboot-klibc-image.bb
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-bsp/initrdscripts/files/init-debug.sh b/meta-openembedded/meta-initramfs/recipes-bsp/initrdscripts/files/init-debug.sh
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-bsp/initrdscripts/files/init-debug.sh
rename to meta-openembedded/meta-initramfs/recipes-bsp/initrdscripts/files/init-debug.sh
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-bsp/initrdscripts/initramfs-debug_1.0.bb b/meta-openembedded/meta-initramfs/recipes-bsp/initrdscripts/initramfs-debug_1.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-bsp/initrdscripts/initramfs-debug_1.0.bb
rename to meta-openembedded/meta-initramfs/recipes-bsp/initrdscripts/initramfs-debug_1.0.bb
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg/icon.xpm b/meta-openembedded/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg/icon.xpm
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg/icon.xpm
rename to meta-openembedded/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg/icon.xpm
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg_0.2.bb b/meta-openembedded/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg_0.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg_0.2.bb
rename to meta-openembedded/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg_0.2.bb
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb b/meta-openembedded/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb
rename to meta-openembedded/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut/0001-util.h-include-sys-reg.h-when-libc-glibc.patch b/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut/0001-util.h-include-sys-reg.h-when-libc-glibc.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut/0001-util.h-include-sys-reg.h-when-libc-glibc.patch
rename to meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut/0001-util.h-include-sys-reg.h-when-libc-glibc.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_git.bb b/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_git.bb
rename to meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_git.bb
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby/0001-Add-another-variable-LIBS-to-provides-libraries-from.patch b/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby/0001-Add-another-variable-LIBS-to-provides-libraries-from.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby/0001-Add-another-variable-LIBS-to-provides-libraries-from.patch
rename to meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby/0001-Add-another-variable-LIBS-to-provides-libraries-from.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby/0002-include-paths.h-for-_PATH_MOUNTED.patch b/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby/0002-include-paths.h-for-_PATH_MOUNTED.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby/0002-include-paths.h-for-_PATH_MOUNTED.patch
rename to meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby/0002-include-paths.h-for-_PATH_MOUNTED.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby/grubby-rename-grub2-editenv-to-grub-editenv.patch b/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby/grubby-rename-grub2-editenv-to-grub-editenv.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby/grubby-rename-grub2-editenv-to-grub-editenv.patch
rename to meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby/grubby-rename-grub2-editenv-to-grub-editenv.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby/run-ptest b/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby/run-ptest
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby/run-ptest
rename to meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby/run-ptest
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby_8.40.bb b/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby_8.40.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby_8.40.bb
rename to meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby_8.40.bb
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.4.bb b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.4.bb
rename to meta-openembedded/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.4.bb
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Define-in_-structs-for-non-glibc-system-libs.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Define-in_-structs-for-non-glibc-system-libs.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Define-in_-structs-for-non-glibc-system-libs.patch
rename to meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Define-in_-structs-for-non-glibc-system-libs.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Kbuild.klibc-Add-path-to-compiler-headers-via-isyste.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Kbuild.klibc-Add-path-to-compiler-headers-via-isyste.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Kbuild.klibc-Add-path-to-compiler-headers-via-isyste.patch
rename to meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Kbuild.klibc-Add-path-to-compiler-headers-via-isyste.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Kbuild.klibc-Use-print-libgcc-file-name-instead-of-p.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Kbuild.klibc-Use-print-libgcc-file-name-instead-of-p.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Kbuild.klibc-Use-print-libgcc-file-name-instead-of-p.patch
rename to meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-Kbuild.klibc-Use-print-libgcc-file-name-instead-of-p.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-always-use-bfd-linker.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-always-use-bfd-linker.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-always-use-bfd-linker.patch
rename to meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-always-use-bfd-linker.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-arm-Do-not-set-a-fallback-march-and-mtune.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-arm-Do-not-set-a-fallback-march-and-mtune.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-arm-Do-not-set-a-fallback-march-and-mtune.patch
rename to meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-arm-Do-not-set-a-fallback-march-and-mtune.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-dash-Specify-format-string-in-fmtstr.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-dash-Specify-format-string-in-fmtstr.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-dash-Specify-format-string-in-fmtstr.patch
rename to meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-dash-Specify-format-string-in-fmtstr.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-include-linux-sysinfo.h-directly.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-include-linux-sysinfo.h-directly.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-include-linux-sysinfo.h-directly.patch
rename to meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-include-linux-sysinfo.h-directly.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-mkfifo-Implement-mkfifo.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-mkfifo-Implement-mkfifo.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-mkfifo-Implement-mkfifo.patch
rename to meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/0001-mkfifo-Implement-mkfifo.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/armv4-fix-v4bx.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/armv4-fix-v4bx.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/armv4-fix-v4bx.patch
rename to meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/armv4-fix-v4bx.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klcc-consider-sysroot.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klcc-consider-sysroot.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klcc-consider-sysroot.patch
rename to meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klcc-consider-sysroot.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klibc-config-eabi.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klibc-config-eabi.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klibc-config-eabi.patch
rename to meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klibc-config-eabi.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klibc-linux-libc-dev.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klibc-linux-libc-dev.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klibc-linux-libc-dev.patch
rename to meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/klibc-linux-libc-dev.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/staging.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/staging.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/staging.patch
rename to meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/staging.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/use-env-for-perl.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/use-env-for-perl.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/use-env-for-perl.patch
rename to meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-2.0.4/use-env-for-perl.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.4.bb b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.4.bb
rename to meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.4.bb
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-utils.inc b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-utils.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-utils.inc
rename to meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-utils.inc
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.4.bb b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.4.bb
rename to meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.4.bb
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc.inc b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc.inc
rename to meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc.inc
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc_2.0.4.bb b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc_2.0.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc_2.0.4.bb
rename to meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc_2.0.4.bb
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0001-Makefile-build-ubi-utils-only.patch b/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0001-Makefile-build-ubi-utils-only.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0001-Makefile-build-ubi-utils-only.patch
rename to meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0001-Makefile-build-ubi-utils-only.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0002-common.mk-for-klibc-CC-is-klcc.patch b/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0002-common.mk-for-klibc-CC-is-klcc.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0002-common.mk-for-klibc-CC-is-klcc.patch
rename to meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0002-common.mk-for-klibc-CC-is-klcc.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0003-libubi.c-add-klibc-specific-fixes-for-ioctl.patch b/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0003-libubi.c-add-klibc-specific-fixes-for-ioctl.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0003-libubi.c-add-klibc-specific-fixes-for-ioctl.patch
rename to meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0003-libubi.c-add-klibc-specific-fixes-for-ioctl.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0004-Restore-compatibility-to-dietlibc-klibc-musl-libc-af.patch b/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0004-Restore-compatibility-to-dietlibc-klibc-musl-libc-af.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0004-Restore-compatibility-to-dietlibc-klibc-musl-libc-af.patch
rename to meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0004-Restore-compatibility-to-dietlibc-klibc-musl-libc-af.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0005-common.h-more-workarounds-for-klibc-compatibility.patch b/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0005-common.h-more-workarounds-for-klibc-compatibility.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0005-common.h-more-workarounds-for-klibc-compatibility.patch
rename to meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0005-common.h-more-workarounds-for-klibc-compatibility.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0006-libiniparser-remove-unused-function-needing-float.patch b/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0006-libiniparser-remove-unused-function-needing-float.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0006-libiniparser-remove-unused-function-needing-float.patch
rename to meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0006-libiniparser-remove-unused-function-needing-float.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0007-mtd-utils-common.c-convert-to-integer-arithmetic.patch b/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0007-mtd-utils-common.c-convert-to-integer-arithmetic.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0007-mtd-utils-common.c-convert-to-integer-arithmetic.patch
rename to meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0007-mtd-utils-common.c-convert-to-integer-arithmetic.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0008-ubi-utils-ubiformat.c-convert-to-integer-arithmetic.patch b/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0008-ubi-utils-ubiformat.c-convert-to-integer-arithmetic.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0008-ubi-utils-ubiformat.c-convert-to-integer-arithmetic.patch
rename to meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0008-ubi-utils-ubiformat.c-convert-to-integer-arithmetic.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0009-Eliminate-warnings-about-implicit-non-const-casting-.patch b/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0009-Eliminate-warnings-about-implicit-non-const-casting-.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0009-Eliminate-warnings-about-implicit-non-const-casting-.patch
rename to meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-1.5.2/0009-Eliminate-warnings-about-implicit-non-const-casting-.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.5.2.bb b/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.5.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.5.2.bb
rename to meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.5.2.bb
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/0001-Adjust-the-order-of-headers-to-fix-build-for-musl.patch b/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/0001-Adjust-the-order-of-headers-to-fix-build-for-musl.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/0001-Adjust-the-order-of-headers-to-fix-build-for-musl.patch
rename to meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/0001-Adjust-the-order-of-headers-to-fix-build-for-musl.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/arm_crashdump.patch b/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/arm_crashdump.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/arm_crashdump.patch
rename to meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/arm_crashdump.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/cflags_static.patch b/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/cflags_static.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/cflags_static.patch
rename to meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/cflags_static.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/fix-out-of-tree-build.patch b/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/fix-out-of-tree-build.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/fix-out-of-tree-build.patch
rename to meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/fix-out-of-tree-build.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/ifdown_errno.patch b/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/ifdown_errno.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/ifdown_errno.patch
rename to meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/ifdown_errno.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/kexec-elf-rel.patch b/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/kexec-elf-rel.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/kexec-elf-rel.patch
rename to meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/kexec-elf-rel.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/kexec-syscall.patch b/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/kexec-syscall.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/kexec-syscall.patch
rename to meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/kexec-syscall.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/ppc__lshrdi3.patch b/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/ppc__lshrdi3.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/ppc__lshrdi3.patch
rename to meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/ppc__lshrdi3.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/purgatory_flags.patch b/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/purgatory_flags.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/purgatory_flags.patch
rename to meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/purgatory_flags.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/purgatory_string.patch b/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/purgatory_string.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/purgatory_string.patch
rename to meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/purgatory_string.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/sha256.patch b/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/sha256.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/sha256.patch
rename to meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/sha256.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/sysconf_nrprocessors.patch b/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/sysconf_nrprocessors.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/sysconf_nrprocessors.patch
rename to meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/sysconf_nrprocessors.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_basename.patch b/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_basename.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_basename.patch
rename to meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_basename.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_kexec_test.patch b/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_kexec_test.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_kexec_test.patch
rename to meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_kexec_test.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_sys_io.patch b/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_sys_io.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_sys_io.patch
rename to meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_sys_io.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_vfscanf.patch b/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_vfscanf.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_vfscanf.patch
rename to meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc-2.0.2/x86_vfscanf.patch
diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb b/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb
rename to meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/COPYING.MIT b/meta-openembedded/meta-multimedia/COPYING.MIT
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/COPYING.MIT
rename to meta-openembedded/meta-multimedia/COPYING.MIT
diff --git a/import-layers/meta-openembedded/meta-multimedia/README b/meta-openembedded/meta-multimedia/README
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/README
rename to meta-openembedded/meta-multimedia/README
diff --git a/import-layers/meta-openembedded/meta-multimedia/classes/juce.bbclass b/meta-openembedded/meta-multimedia/classes/juce.bbclass
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/classes/juce.bbclass
rename to meta-openembedded/meta-multimedia/classes/juce.bbclass
diff --git a/import-layers/meta-openembedded/meta-multimedia/conf/layer.conf b/meta-openembedded/meta-multimedia/conf/layer.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/conf/layer.conf
rename to meta-openembedded/meta-multimedia/conf/layer.conf
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/files/move_vapigen.patch b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/files/move_vapigen.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/files/move_vapigen.patch
rename to meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/files/move_vapigen.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp.inc b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp.inc
rename to meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp.inc
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.0.2.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.0.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.0.2.bb
rename to meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.0.2.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-av.inc b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-av.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-av.inc
rename to meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-av.inc
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.12.10.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.12.10.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.12.10.bb
rename to meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.12.10.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.10.5.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.10.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.10.5.bb
rename to meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.10.5.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.4.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.4.bb
rename to meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.4.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.8.13.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.8.13.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.8.13.bb
rename to meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.8.13.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp.inc b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp.inc
rename to meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp.inc
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.0.2.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.0.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.0.2.bb
rename to meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.0.2.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp_git.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp_git.bb
rename to meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp_git.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.34.0.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.34.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.34.0.bb
rename to meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.34.0.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-dvb/oscam/oscam/respect-cflags.patch b/meta-openembedded/meta-multimedia/recipes-dvb/oscam/oscam/respect-cflags.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-dvb/oscam/oscam/respect-cflags.patch
rename to meta-openembedded/meta-multimedia/recipes-dvb/oscam/oscam/respect-cflags.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb b/meta-openembedded/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb
rename to meta-openembedded/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/jsonschemabuilder-native.bb b/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/jsonschemabuilder-native.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/jsonschemabuilder-native.bb
rename to meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/jsonschemabuilder-native.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0001-Fix-file_Emu-on-musl.patch b/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0001-Fix-file_Emu-on-musl.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0001-Fix-file_Emu-on-musl.patch
rename to meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0001-Fix-file_Emu-on-musl.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0001-change-order-of-detecting-libegl-and-libgles2.patch b/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0001-change-order-of-detecting-libegl-and-libgles2.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0001-change-order-of-detecting-libegl-and-libgles2.patch
rename to meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0001-change-order-of-detecting-libegl-and-libgles2.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0002-Remove-FILEWRAP.patch b/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0002-Remove-FILEWRAP.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0002-Remove-FILEWRAP.patch
rename to meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0002-Remove-FILEWRAP.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0003-configure-don-t-try-to-run-stuff-to-find-tinyxml.patch b/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0003-configure-don-t-try-to-run-stuff-to-find-tinyxml.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0003-configure-don-t-try-to-run-stuff-to-find-tinyxml.patch
rename to meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0003-configure-don-t-try-to-run-stuff-to-find-tinyxml.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0004-handle-SIGTERM.patch b/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0004-handle-SIGTERM.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0004-handle-SIGTERM.patch
rename to meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0004-handle-SIGTERM.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0005-add-support-to-read-frequency-output-if-using-intel-.patch b/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0005-add-support-to-read-frequency-output-if-using-intel-.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0005-add-support-to-read-frequency-output-if-using-intel-.patch
rename to meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0005-add-support-to-read-frequency-output-if-using-intel-.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0006-Disable-DVD-support.patch b/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0006-Disable-DVD-support.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0006-Disable-DVD-support.patch
rename to meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0006-Disable-DVD-support.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0007-Always-compile-libcpluff-as-PIC.patch b/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0007-Always-compile-libcpluff-as-PIC.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0007-Always-compile-libcpluff-as-PIC.patch
rename to meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0007-Always-compile-libcpluff-as-PIC.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0008-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch b/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0008-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0008-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
rename to meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0008-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0009-build-Add-support-for-musl-triplets.patch b/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0009-build-Add-support-for-musl-triplets.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0009-build-Add-support-for-musl-triplets.patch
rename to meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0009-build-Add-support-for-musl-triplets.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0010-RssReader-Fix-compiler-warning-comparing-pointer-to-.patch b/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0010-RssReader-Fix-compiler-warning-comparing-pointer-to-.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0010-RssReader-Fix-compiler-warning-comparing-pointer-to-.patch
rename to meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0010-RssReader-Fix-compiler-warning-comparing-pointer-to-.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0011-Let-configure-pass-on-unknown-architectures-setting-.patch b/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0011-Let-configure-pass-on-unknown-architectures-setting-.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0011-Let-configure-pass-on-unknown-architectures-setting-.patch
rename to meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0011-Let-configure-pass-on-unknown-architectures-setting-.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0012-Revert-droid-fix-builds-with-AML-disabled.patch b/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0012-Revert-droid-fix-builds-with-AML-disabled.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0012-Revert-droid-fix-builds-with-AML-disabled.patch
rename to meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0012-Revert-droid-fix-builds-with-AML-disabled.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0013-FTPParse.cpp-use-std-string.patch b/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0013-FTPParse.cpp-use-std-string.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0013-FTPParse.cpp-use-std-string.patch
rename to meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0013-FTPParse.cpp-use-std-string.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-startup/kodi.service b/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-startup/kodi.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-startup/kodi.service
rename to meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-startup/kodi.service
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb b/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb
rename to meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml/ldflags.patch b/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml/ldflags.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml/ldflags.patch
rename to meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml/ldflags.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml/override-uname.patch b/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml/override-uname.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml/override-uname.patch
rename to meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml/override-uname.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml_1.3.0.bb b/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml_1.3.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml_1.3.0.bb
rename to meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml_1.3.0.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-mkv/libmatroska/libmatroska/0001-Makefile-Use-LINKFLAGS-during-link-step.patch b/meta-openembedded/meta-multimedia/recipes-mkv/libmatroska/libmatroska/0001-Makefile-Use-LINKFLAGS-during-link-step.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-mkv/libmatroska/libmatroska/0001-Makefile-Use-LINKFLAGS-during-link-step.patch
rename to meta-openembedded/meta-multimedia/recipes-mkv/libmatroska/libmatroska/0001-Makefile-Use-LINKFLAGS-during-link-step.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.4.1.bb b/meta-openembedded/meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.4.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.4.1.bb
rename to meta-openembedded/meta-multimedia/recipes-mkv/libmatroska/libmatroska_1.4.1.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/alsa-equal/alsa-equal/0001-Fix-asneeded.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/alsa-equal/alsa-equal/0001-Fix-asneeded.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/alsa-equal/alsa-equal/0001-Fix-asneeded.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/alsa-equal/alsa-equal/0001-Fix-asneeded.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/alsa-equal/alsa-equal/0002-Fix-Eq-CAPS-plugin-name.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/alsa-equal/alsa-equal/0002-Fix-Eq-CAPS-plugin-name.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/alsa-equal/alsa-equal/0002-Fix-Eq-CAPS-plugin-name.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/alsa-equal/alsa-equal/0002-Fix-Eq-CAPS-plugin-name.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/alsa-equal/alsa-equal/0003-Fix-mixer.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/alsa-equal/alsa-equal/0003-Fix-mixer.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/alsa-equal/alsa-equal/0003-Fix-mixer.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/alsa-equal/alsa-equal/0003-Fix-mixer.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/alsa-equal/alsa-equal_0.6.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/alsa-equal/alsa-equal_0.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/alsa-equal/alsa-equal_0.6.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/alsa-equal/alsa-equal_0.6.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps/0001-Do-not-use-obsolete-pow10f-function.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps/0001-Do-not-use-obsolete-pow10f-function.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps/0001-Do-not-use-obsolete-pow10f-function.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps/0001-Do-not-use-obsolete-pow10f-function.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps/0001-basic.h-Use-c99-supported-stdint-types.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps/0001-basic.h-Use-c99-supported-stdint-types.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps/0001-basic.h-Use-c99-supported-stdint-types.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps/0001-basic.h-Use-c99-supported-stdint-types.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps/Avoid-ambiguity-in-div-invocation.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps/Avoid-ambiguity-in-div-invocation.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps/Avoid-ambiguity-in-div-invocation.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps/Avoid-ambiguity-in-div-invocation.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps/append_ldflags.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps/append_ldflags.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps/append_ldflags.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps/append_ldflags.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/cdparanoia_10.2.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/cdparanoia_10.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/cdparanoia_10.2.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/cdparanoia_10.2.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/files/0001-Use-DESTDIR-in-install-Makefile-rule.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/files/0001-Use-DESTDIR-in-install-Makefile-rule.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/files/0001-Use-DESTDIR-in-install-Makefile-rule.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/files/0001-Use-DESTDIR-in-install-Makefile-rule.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/files/0001-check-for-null-buffer-before-trying-a-byteswap.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/files/0001-check-for-null-buffer-before-trying-a-byteswap.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/files/0001-check-for-null-buffer-before-trying-a-byteswap.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/files/0001-check-for-null-buffer-before-trying-a-byteswap.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/files/0001-utils-Use-c99-compiler-independent-types.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/files/0001-utils-Use-c99-compiler-independent-types.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/files/0001-utils-Use-c99-compiler-independent-types.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/files/0001-utils-Use-c99-compiler-independent-types.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/files/0002-Fix-printf-format-errors.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/files/0002-Fix-printf-format-errors.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/files/0002-Fix-printf-format-errors.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/files/0002-Fix-printf-format-errors.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/files/0002-interface-remove-C-reserved-keyword.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/files/0002-interface-remove-C-reserved-keyword.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/files/0002-interface-remove-C-reserved-keyword.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/files/0002-interface-remove-C-reserved-keyword.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/files/0003-Fix-missing-shared-object-LDFLAGS.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/files/0003-Fix-missing-shared-object-LDFLAGS.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/files/0003-Fix-missing-shared-object-LDFLAGS.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/files/0003-Fix-missing-shared-object-LDFLAGS.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/files/dont-use-internal-configs.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/files/dont-use-internal-configs.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/files/dont-use-internal-configs.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/files/dont-use-internal-configs.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/files/out-of-tree-build.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/files/out-of-tree-build.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/files/out-of-tree-build.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/files/out-of-tree-build.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/dca/dcadec_0.2.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/dca/dcadec_0.2.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/dca/dcadec_0.2.0.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/dca/dcadec_0.2.0.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-connector-dbus_0.3.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-connector-dbus_0.3.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-connector-dbus_0.3.0.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-connector-dbus_0.3.0.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-core_0.6.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-core_0.6.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-core_0.6.0.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-core_0.6.0.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-renderer_0.6.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-renderer_0.6.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-renderer_0.6.0.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-renderer_0.6.0.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-server_0.6.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-server_0.6.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-server_0.6.0.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-server_0.6.0.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/faac/faac_1.29.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/faac/faac_1.29.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/faac/faac_1.29.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/faac/faac_1.29.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/faac/files/0001-mp4v2-Define-__STRING-if-cdefs.h-does-not-exist.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/faac/files/0001-mp4v2-Define-__STRING-if-cdefs.h-does-not-exist.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/faac/files/0001-mp4v2-Define-__STRING-if-cdefs.h-does-not-exist.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/faac/files/0001-mp4v2-Define-__STRING-if-cdefs.h-does-not-exist.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/files/0001-Use-ARM-NEON-accelaration-for-float-multithreaded-se.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/files/0001-Use-ARM-NEON-accelaration-for-float-multithreaded-se.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/files/0001-Use-ARM-NEON-accelaration-for-float-multithreaded-se.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/files/0001-Use-ARM-NEON-accelaration-for-float-multithreaded-se.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.10.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.10.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.10.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_1.1.10.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/files/gerbera.service b/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/files/gerbera.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/files/gerbera.service
rename to meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/files/gerbera.service
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_git.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_git.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_git.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo-mp3_0.10.31.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo-mp3_0.10.31.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo-mp3_0.10.31.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo-mp3_0.10.31.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo-mpegdemux_0.10.85.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo-mpegdemux_0.10.85.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo-mpegdemux_0.10.85.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo-mpegdemux_0.10.85.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo.inc b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo.inc
rename to meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo.inc
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-meta-base_0.10.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-meta-base_0.10.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-meta-base_0.10.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-meta-base_0.10.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax/gcc_4.6.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax/gcc_4.6.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax/gcc_4.6.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax/gcc_4.6.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax/ptr-array.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax/ptr-array.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax/ptr-array.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax/ptr-array.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax_0.10.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax_0.10.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax_0.10.1.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax_0.10.1.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-bad/buffer-overflow-mp4.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-bad/buffer-overflow-mp4.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-bad/buffer-overflow-mp4.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-bad/buffer-overflow-mp4.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-bad_0.10.23.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-bad_0.10.23.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-bad_0.10.23.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-bad_0.10.23.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/0001-aclocal.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/0001-aclocal.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/0001-aclocal.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/0001-aclocal.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/configure.ac-fix-subparse-plugin.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/configure.ac-fix-subparse-plugin.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/configure.ac-fix-subparse-plugin.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/configure.ac-fix-subparse-plugin.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/gst-plugins-base-tremor.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/gst-plugins-base-tremor.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/gst-plugins-base-tremor.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/gst-plugins-base-tremor.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base_0.10.36.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base_0.10.36.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base_0.10.36.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base_0.10.36.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl/0001-conditional-gl-framebuffer-undefined-use.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl/0001-conditional-gl-framebuffer-undefined-use.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl/0001-conditional-gl-framebuffer-undefined-use.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl/0001-conditional-gl-framebuffer-undefined-use.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl/rpi-egl-gles2-dep.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl/rpi-egl-gles2-dep.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl/rpi-egl-gles2-dep.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl/rpi-egl-gles2-dep.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl_0.10.3.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl_0.10.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl_0.10.3.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl_0.10.3.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0407-mulawdec-fix-integer-overrun.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0407-mulawdec-fix-integer-overrun.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0407-mulawdec-fix-integer-overrun.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0407-mulawdec-fix-integer-overrun.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good_0.10.31.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good_0.10.31.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good_0.10.31.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good_0.10.31.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly/0001-cdio-compensate-for-libcdio-s-recent-cd-text-api-cha.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly/0001-cdio-compensate-for-libcdio-s-recent-cd-text-api-cha.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly/0001-cdio-compensate-for-libcdio-s-recent-cd-text-api-cha.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly/0001-cdio-compensate-for-libcdio-s-recent-cd-text-api-cha.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly/0002-Fix-opencore-include-paths.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly/0002-Fix-opencore-include-paths.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly/0002-Fix-opencore-include-paths.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly/0002-Fix-opencore-include-paths.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly_0.10.19.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly_0.10.19.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly_0.10.19.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly_0.10.19.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins.inc b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins.inc
rename to meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins.inc
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp/0001-change-deprecated-INCLUDES-to-AM_CPPFLAGS-for-automa.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp/0001-change-deprecated-INCLUDES-to-AM_CPPFLAGS-for-automa.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp/0001-change-deprecated-INCLUDES-to-AM_CPPFLAGS-for-automa.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp/0001-change-deprecated-INCLUDES-to-AM_CPPFLAGS-for-automa.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp_0.10.8.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp_0.10.8.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp_0.10.8.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp_0.10.8.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0001-baseparse-Fix-self-comparison-always-evaluates-to-tr.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0001-baseparse-Fix-self-comparison-always-evaluates-to-tr.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0001-baseparse-Fix-self-comparison-always-evaluates-to-tr.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0001-baseparse-Fix-self-comparison-always-evaluates-to-tr.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0001-parse-make-grammar.y-work-with-Bison-3.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0001-parse-make-grammar.y-work-with-Bison-3.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0001-parse-make-grammar.y-work-with-Bison-3.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0001-parse-make-grammar.y-work-with-Bison-3.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0002-gst-glib2.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0002-gst-glib2.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0002-gst-glib2.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0002-gst-glib2.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/check_fix.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/check_fix.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/check_fix.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/check_fix.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gst-inspect-check-error.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gst-inspect-check-error.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gst-inspect-check-error.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gst-inspect-check-error.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gstregistrybinary.c b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gstregistrybinary.c
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gstregistrybinary.c
rename to meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gstregistrybinary.c
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gstregistrybinary.h b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gstregistrybinary.h
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gstregistrybinary.h
rename to meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gstregistrybinary.h
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer_0.10.36.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer_0.10.36.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer_0.10.36.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer_0.10.36.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd.inc b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd.inc
rename to meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd.inc
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd/0001-gstd-yocto-compatibility.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_1.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_1.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_1.0.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-1.0/gstd_1.0.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/juce/nativesdk-projucer_git.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/juce/nativesdk-projucer_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/juce/nativesdk-projucer_git.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/juce/nativesdk-projucer_git.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/juce/projucer-native_git.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/juce/projucer-native_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/juce/projucer-native_git.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/juce/projucer-native_git.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/juce/projucer.inc b/meta-openembedded/meta-multimedia/recipes-multimedia/juce/projucer.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/juce/projucer.inc
rename to meta-openembedded/meta-multimedia/recipes-multimedia/juce/projucer.inc
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/libao/libao_1.2.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libao/libao_1.2.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/libao/libao_1.2.0.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/libao/libao_1.2.0.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/libavc1394/libavc1394_0.5.4.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libavc1394/libavc1394_0.5.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/libavc1394/libavc1394_0.5.4.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/libavc1394/libavc1394_0.5.4.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/libdc1394/files/install_examples.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/libdc1394/files/install_examples.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/libdc1394/files/install_examples.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/libdc1394/files/install_examples.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/libde265/libde265_1.0.2.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libde265/libde265_1.0.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/libde265/libde265_1.0.2.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/libde265/libde265_1.0.2.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/libdvbpsi/libdvbpsi_1.3.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libdvbpsi/libdvbpsi_1.3.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/libdvbpsi/libdvbpsi_1.3.0.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/libdvbpsi/libdvbpsi_1.3.0.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/libdvdnav/libdvdnav_5.0.3.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libdvdnav/libdvdnav_5.0.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/libdvdnav/libdvdnav_5.0.3.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/libdvdnav/libdvdnav_5.0.3.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/libiec61883/libiec61883_1.2.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libiec61883/libiec61883_1.2.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/libiec61883/libiec61883_1.2.0.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/libiec61883/libiec61883_1.2.0.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/libsquish/libsquish_git.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libsquish/libsquish_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/libsquish/libsquish_git.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/libsquish/libsquish_git.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpd-11.8.17/glibc-2.20.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpd-11.8.17/glibc-2.20.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpd-11.8.17/glibc-2.20.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpd-11.8.17/glibc-2.20.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpd_11.8.17.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpd_11.8.17.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpd_11.8.17.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpd_11.8.17.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd/mpd.conf.in b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd/mpd.conf.in
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd/mpd.conf.in
rename to meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd/mpd.conf.in
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.18.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.18.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.18.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.18.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/openal/openal-soft_1.15.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/openal/openal-soft_1.15.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/openal/openal-soft_1.15.1.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/openal/openal-soft_1.15.1.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/opencore-amr/opencore-amr_0.1.3.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/opencore-amr/opencore-amr_0.1.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/opencore-amr/opencore-amr_0.1.3.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/opencore-amr/opencore-amr_0.1.3.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/opencore-amr/vo-aacenc_0.1.3.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/opencore-amr/vo-aacenc_0.1.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/opencore-amr/vo-aacenc_0.1.3.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/opencore-amr/vo-aacenc_0.1.3.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/opencore-amr/vo-amrwbenc_0.1.3.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/opencore-amr/vo-amrwbenc_0.1.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/opencore-amr/vo-amrwbenc_0.1.3.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/opencore-amr/vo-amrwbenc_0.1.3.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/openh264/openh264_1.7.0.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/opusfile/opusfile_0.10.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/opusfile/opusfile_0.10.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/opusfile/opusfile_0.10.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/opusfile/opusfile_0.10.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump/fix-racing-build-issue.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump/fix-racing-build-issue.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump/fix-racing-build-issue.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump/fix-racing-build-issue.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.4.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.4.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.4.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/schroedinger/schroedinger/configure.ac.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/schroedinger/schroedinger/configure.ac.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/schroedinger/schroedinger/configure.ac.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/schroedinger/schroedinger/configure.ac.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/schroedinger/schroedinger_1.0.11.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/schroedinger/schroedinger_1.0.11.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/schroedinger/schroedinger_1.0.11.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/schroedinger/schroedinger_1.0.11.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sox/sox/0001-Update-exported-symbol-list.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/sox/sox/0001-Update-exported-symbol-list.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sox/sox/0001-Update-exported-symbol-list.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/sox/sox/0001-Update-exported-symbol-list.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sox/sox/0001-remove-the-error-line-and-live-without-file-type-det.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/sox/sox/0001-remove-the-error-line-and-live-without-file-type-det.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sox/sox/0001-remove-the-error-line-and-live-without-file-type-det.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/sox/sox/0001-remove-the-error-line-and-live-without-file-type-det.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/streamripper/streamripper/0001-build-these-are-foreign-automake-projects.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/streamripper/streamripper/0001-build-these-are-foreign-automake-projects.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/streamripper/streamripper/0001-build-these-are-foreign-automake-projects.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/streamripper/streamripper/0001-build-these-are-foreign-automake-projects.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/streamripper/streamripper/0002-build-don-t-ignore-CPPFLAGS-from-environment.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/streamripper/streamripper/0002-build-don-t-ignore-CPPFLAGS-from-environment.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/streamripper/streamripper/0002-build-don-t-ignore-CPPFLAGS-from-environment.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/streamripper/streamripper/0002-build-don-t-ignore-CPPFLAGS-from-environment.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/streamripper/streamripper/0003-ripstream-fix-compilation.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/streamripper/streamripper/0003-ripstream-fix-compilation.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/streamripper/streamripper/0003-ripstream-fix-compilation.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/streamripper/streamripper/0003-ripstream-fix-compilation.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/streamripper/streamripper_1.64.6.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/streamripper/streamripper_1.64.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/streamripper/streamripper_1.64.6.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/streamripper/streamripper_1.64.6.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa_1.1.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa_1.1.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa_1.1.1.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/tinyalsa/tinyalsa_1.1.1.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/tremor/tremor/obsolete_automake_macros.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/tremor/tremor/obsolete_automake_macros.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/tremor/tremor/obsolete_automake_macros.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/tremor/tremor/obsolete_automake_macros.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/tremor/tremor/tremor-arm-thumb2.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/tremor/tremor/tremor-arm-thumb2.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/tremor/tremor/tremor-arm-thumb2.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/tremor/tremor/tremor-arm-thumb2.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/tremor/tremor_20150107.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/tremor/tremor_20150107.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/tremor/tremor_20150107.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/tremor/tremor_20150107.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.3.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.3.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.3.0.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/vlc/libdvdcss_1.3.0.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc.inc
rename to meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc.inc
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0001-enable-subdir-objects.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0001-enable-subdir-objects.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0001-enable-subdir-objects.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0001-enable-subdir-objects.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0002-glibc-does-not-provide-strlcpy.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0002-glibc-does-not-provide-strlcpy.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0002-glibc-does-not-provide-strlcpy.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0002-glibc-does-not-provide-strlcpy.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0003-use-am-path-libgcrypt.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0003-use-am-path-libgcrypt.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0003-use-am-path-libgcrypt.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0003-use-am-path-libgcrypt.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0004-modules-gui-qt4-out-of-tree-build.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0004-modules-gui-qt4-out-of-tree-build.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0004-modules-gui-qt4-out-of-tree-build.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0004-modules-gui-qt4-out-of-tree-build.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0005-libpostproc-header-check.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0005-libpostproc-header-check.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0005-libpostproc-header-check.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0005-libpostproc-header-check.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0006-make-opencv-configurable.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0006-make-opencv-configurable.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0006-make-opencv-configurable.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0006-make-opencv-configurable.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0007-use-vorbisidec.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0007-use-vorbisidec.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0007-use-vorbisidec.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0007-use-vorbisidec.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0008-fix-luaL-checkint.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0008-fix-luaL-checkint.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0008-fix-luaL-checkint.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0008-fix-luaL-checkint.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0009-Avcodec-swscale-use-AV_PIX_FMT-consistently.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0009-Avcodec-swscale-use-AV_PIX_FMT-consistently.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0009-Avcodec-swscale-use-AV_PIX_FMT-consistently.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0009-Avcodec-swscale-use-AV_PIX_FMT-consistently.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0010-SWSCALE-fix-compilation-with-4.x.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0010-SWSCALE-fix-compilation-with-4.x.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0010-SWSCALE-fix-compilation-with-4.x.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/0010-SWSCALE-fix-compilation-with-4.x.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_2.2.2.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_2.2.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_2.2.2.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_2.2.2.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/0004-Fix-format-error-blocking-compilation-with-hardening.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/0004-Fix-format-error-blocking-compilation-with-hardening.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/0004-Fix-format-error-blocking-compilation-with-hardening.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/0004-Fix-format-error-blocking-compilation-with-hardening.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools_1.4.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools_1.4.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools_1.4.0.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools_1.4.0.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing/0001-build-Protect-against-unsupported-CPU-types.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing/0001-build-Protect-against-unsupported-CPU-types.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing/0001-build-Protect-against-unsupported-CPU-types.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing/0001-build-Protect-against-unsupported-CPU-types.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing/0002-build-Add-ARM-64bit-support.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing/0002-build-Add-ARM-64bit-support.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing/0002-build-Add-ARM-64bit-support.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing/0002-build-Add-ARM-64bit-support.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing/0003-build-fix-architecture-detection.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing/0003-build-fix-architecture-detection.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing/0003-build-fix-architecture-detection.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing/0003-build-fix-architecture-detection.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing/0004-typedefs.h-add-support-for-64-bit-and-big-endian-MIP.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing/0004-typedefs.h-add-support-for-64-bit-and-big-endian-MIP.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing/0004-typedefs.h-add-support-for-64-bit-and-big-endian-MIP.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing/0004-typedefs.h-add-support-for-64-bit-and-big-endian-MIP.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing/0005-typedefs.h-add-support-for-PowerPC.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing/0005-typedefs.h-add-support-for-PowerPC.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing/0005-typedefs.h-add-support-for-PowerPC.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing/0005-typedefs.h-add-support-for-PowerPC.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing/0006-common_audio-implement-endianness-conversion-in-wav-.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing/0006-common_audio-implement-endianness-conversion-in-wav-.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing/0006-common_audio-implement-endianness-conversion-in-wav-.patch
rename to meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing/0006-common_audio-implement-endianness-conversion-in-wav-.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing_0.3.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing_0.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing_0.3.bb
rename to meta-openembedded/meta-multimedia/recipes-multimedia/webrtc-audio-processing/webrtc-audio-processing_0.3.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-support/crossguid/crossguid.bb b/meta-openembedded/meta-multimedia/recipes-support/crossguid/crossguid.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-support/crossguid/crossguid.bb
rename to meta-openembedded/meta-multimedia/recipes-support/crossguid/crossguid.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-support/gst-instruments/gst-instruments_0.2.3.bb b/meta-openembedded/meta-multimedia/recipes-support/gst-instruments/gst-instruments_0.2.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-support/gst-instruments/gst-instruments_0.2.3.bb
rename to meta-openembedded/meta-multimedia/recipes-support/gst-instruments/gst-instruments_0.2.3.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.0.bb b/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.0.bb
rename to meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.0.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart.inc b/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart.inc
rename to meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart.inc
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart_0.7.0.bb b/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart_0.7.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart_0.7.0.bb
rename to meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart_0.7.0.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-support/liboil/liboil-0.3.17/0001-Fix-enable-vfp-flag.patch b/meta-openembedded/meta-multimedia/recipes-support/liboil/liboil-0.3.17/0001-Fix-enable-vfp-flag.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-support/liboil/liboil-0.3.17/0001-Fix-enable-vfp-flag.patch
rename to meta-openembedded/meta-multimedia/recipes-support/liboil/liboil-0.3.17/0001-Fix-enable-vfp-flag.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-support/liboil/liboil-0.3.17/fix-unaligned-whitelist.patch b/meta-openembedded/meta-multimedia/recipes-support/liboil/liboil-0.3.17/fix-unaligned-whitelist.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-support/liboil/liboil-0.3.17/fix-unaligned-whitelist.patch
rename to meta-openembedded/meta-multimedia/recipes-support/liboil/liboil-0.3.17/fix-unaligned-whitelist.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-support/liboil/liboil-0.3.17/liboil_fix_for_x32.patch b/meta-openembedded/meta-multimedia/recipes-support/liboil/liboil-0.3.17/liboil_fix_for_x32.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-support/liboil/liboil-0.3.17/liboil_fix_for_x32.patch
rename to meta-openembedded/meta-multimedia/recipes-support/liboil/liboil-0.3.17/liboil_fix_for_x32.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-support/liboil/liboil-0.3.17/no-tests.patch b/meta-openembedded/meta-multimedia/recipes-support/liboil/liboil-0.3.17/no-tests.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-support/liboil/liboil-0.3.17/no-tests.patch
rename to meta-openembedded/meta-multimedia/recipes-support/liboil/liboil-0.3.17/no-tests.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-support/liboil/liboil_0.3.17.bb b/meta-openembedded/meta-multimedia/recipes-support/liboil/liboil_0.3.17.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-support/liboil/liboil_0.3.17.bb
rename to meta-openembedded/meta-multimedia/recipes-support/liboil/liboil_0.3.17.bb
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-support/libsrtp/libsrtp/0001-Rename-conflicting-variable-mips.patch b/meta-openembedded/meta-multimedia/recipes-support/libsrtp/libsrtp/0001-Rename-conflicting-variable-mips.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-support/libsrtp/libsrtp/0001-Rename-conflicting-variable-mips.patch
rename to meta-openembedded/meta-multimedia/recipes-support/libsrtp/libsrtp/0001-Rename-conflicting-variable-mips.patch
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-support/libsrtp/libsrtp_1.5.2.bb b/meta-openembedded/meta-multimedia/recipes-support/libsrtp/libsrtp_1.5.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-multimedia/recipes-support/libsrtp/libsrtp_1.5.2.bb
rename to meta-openembedded/meta-multimedia/recipes-support/libsrtp/libsrtp_1.5.2.bb
diff --git a/import-layers/meta-openembedded/meta-networking/COPYING.MIT b/meta-openembedded/meta-networking/COPYING.MIT
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/COPYING.MIT
rename to meta-openembedded/meta-networking/COPYING.MIT
diff --git a/import-layers/meta-openembedded/meta-networking/MAINTAINERS b/meta-openembedded/meta-networking/MAINTAINERS
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/MAINTAINERS
rename to meta-openembedded/meta-networking/MAINTAINERS
diff --git a/import-layers/meta-openembedded/meta-networking/README b/meta-openembedded/meta-networking/README
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/README
rename to meta-openembedded/meta-networking/README
diff --git a/import-layers/meta-openembedded/meta-networking/classes/waf-samba.bbclass b/meta-openembedded/meta-networking/classes/waf-samba.bbclass
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/classes/waf-samba.bbclass
rename to meta-openembedded/meta-networking/classes/waf-samba.bbclass
diff --git a/import-layers/meta-openembedded/meta-networking/conf/layer.conf b/meta-openembedded/meta-networking/conf/layer.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/conf/layer.conf
rename to meta-openembedded/meta-networking/conf/layer.conf
diff --git a/import-layers/meta-openembedded/meta-networking/files/waf-cross-answers/README b/meta-openembedded/meta-networking/files/waf-cross-answers/README
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/files/waf-cross-answers/README
rename to meta-openembedded/meta-networking/files/waf-cross-answers/README
diff --git a/import-layers/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-aarch64.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-aarch64.txt
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-aarch64.txt
rename to meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-aarch64.txt
diff --git a/import-layers/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-aarch64_be.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-aarch64_be.txt
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-aarch64_be.txt
rename to meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-aarch64_be.txt
diff --git a/import-layers/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-arm.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-arm.txt
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-arm.txt
rename to meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-arm.txt
diff --git a/import-layers/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-i586.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-i586.txt
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-i586.txt
rename to meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-i586.txt
diff --git a/import-layers/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-i686.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-i686.txt
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-i686.txt
rename to meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-i686.txt
diff --git a/import-layers/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mips.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mips.txt
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mips.txt
rename to meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mips.txt
diff --git a/import-layers/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mips64.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mips64.txt
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mips64.txt
rename to meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mips64.txt
diff --git a/import-layers/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mipsel.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mipsel.txt
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mipsel.txt
rename to meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-mipsel.txt
diff --git a/import-layers/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-powerpc.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-powerpc.txt
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-powerpc.txt
rename to meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-powerpc.txt
diff --git a/import-layers/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-powerpc64.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-powerpc64.txt
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-powerpc64.txt
rename to meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-powerpc64.txt
diff --git a/import-layers/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-riscv64.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-riscv64.txt
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-riscv64.txt
rename to meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-riscv64.txt
diff --git a/import-layers/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-x86_64.txt b/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-x86_64.txt
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-x86_64.txt
rename to meta-openembedded/meta-networking/files/waf-cross-answers/cross-answers-x86_64.txt
diff --git a/import-layers/meta-openembedded/meta-networking/licenses/DMTF b/meta-openembedded/meta-networking/licenses/DMTF
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/licenses/DMTF
rename to meta-openembedded/meta-networking/licenses/DMTF
diff --git a/import-layers/meta-openembedded/meta-networking/licenses/copyleft-next-0.3.0 b/meta-openembedded/meta-networking/licenses/copyleft-next-0.3.0
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/licenses/copyleft-next-0.3.0
rename to meta-openembedded/meta-networking/licenses/copyleft-next-0.3.0
diff --git a/import-layers/meta-openembedded/meta-networking/licenses/netperf b/meta-openembedded/meta-networking/licenses/netperf
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/licenses/netperf
rename to meta-openembedded/meta-networking/licenses/netperf
diff --git a/import-layers/meta-openembedded/meta-networking/licenses/radvd b/meta-openembedded/meta-networking/licenses/radvd
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/licenses/radvd
rename to meta-openembedded/meta-networking/licenses/radvd
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/crda/crda/0001-Makefile-respect-LDFLAGS-for-libreg.patch b/meta-openembedded/meta-networking/recipes-connectivity/crda/crda/0001-Makefile-respect-LDFLAGS-for-libreg.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/crda/crda/0001-Makefile-respect-LDFLAGS-for-libreg.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/crda/crda/0001-Makefile-respect-LDFLAGS-for-libreg.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/crda/crda/do-not-run-ldconfig-if-destdir-is-set.patch b/meta-openembedded/meta-networking/recipes-connectivity/crda/crda/do-not-run-ldconfig-if-destdir-is-set.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/crda/crda/do-not-run-ldconfig-if-destdir-is-set.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/crda/crda/do-not-run-ldconfig-if-destdir-is-set.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/crda/crda/fix-gcc-6-unused-variables.patch b/meta-openembedded/meta-networking/recipes-connectivity/crda/crda/fix-gcc-6-unused-variables.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/crda/crda/fix-gcc-6-unused-variables.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/crda/crda/fix-gcc-6-unused-variables.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/crda/crda/fix-issues-when-USE_OPENSSL-1.patch b/meta-openembedded/meta-networking/recipes-connectivity/crda/crda/fix-issues-when-USE_OPENSSL-1.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/crda/crda/fix-issues-when-USE_OPENSSL-1.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/crda/crda/fix-issues-when-USE_OPENSSL-1.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch b/meta-openembedded/meta-networking/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/crda/crda/make.patch b/meta-openembedded/meta-networking/recipes-connectivity/crda/crda/make.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/crda/crda/make.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/crda/crda/make.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/crda/crda/use-target-word-size-instead-of-host-s.patch b/meta-openembedded/meta-networking/recipes-connectivity/crda/crda/use-target-word-size-instead-of-host-s.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/crda/crda/use-target-word-size-instead-of-host-s.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/crda/crda/use-target-word-size-instead-of-host-s.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/crda/crda_3.18.bb b/meta-openembedded/meta-networking/recipes-connectivity/crda/crda_3.18.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/crda/crda_3.18.bb
rename to meta-openembedded/meta-networking/recipes-connectivity/crda/crda_3.18.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb b/meta-openembedded/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb
rename to meta-openembedded/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/daq/files/0001-correct-the-location-of-unistd.h.patch b/meta-openembedded/meta-networking/recipes-connectivity/daq/files/0001-correct-the-location-of-unistd.h.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/daq/files/0001-correct-the-location-of-unistd.h.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/daq/files/0001-correct-the-location-of-unistd.h.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/daq/files/disable-run-test-program-while-cross-compiling.patch b/meta-openembedded/meta-networking/recipes-connectivity/daq/files/disable-run-test-program-while-cross-compiling.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/daq/files/disable-run-test-program-while-cross-compiling.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/daq/files/disable-run-test-program-while-cross-compiling.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_6.11.5.bb b/meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_6.11.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_6.11.5.bb
rename to meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_6.11.5.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler/dibbler_fix_getSize_crash.patch b/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler/dibbler_fix_getSize_crash.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler/dibbler_fix_getSize_crash.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler/dibbler_fix_getSize_crash.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb
rename to meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/ez-ipupdate/ez-ipupdate_3.0.11b7.bb b/meta-openembedded/meta-networking/recipes-connectivity/ez-ipupdate/ez-ipupdate_3.0.11b7.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/ez-ipupdate/ez-ipupdate_3.0.11b7.bb
rename to meta-openembedded/meta-networking/recipes-connectivity/ez-ipupdate/ez-ipupdate_3.0.11b7.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/ez-ipupdate/files/Makefile.am.patch b/meta-openembedded/meta-networking/recipes-connectivity/ez-ipupdate/files/Makefile.am.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/ez-ipupdate/files/Makefile.am.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/ez-ipupdate/files/Makefile.am.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/ez-ipupdate/files/cache_file.c.patch b/meta-openembedded/meta-networking/recipes-connectivity/ez-ipupdate/files/cache_file.c.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/ez-ipupdate/files/cache_file.c.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/ez-ipupdate/files/cache_file.c.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/ez-ipupdate/files/conf_file.c.patch b/meta-openembedded/meta-networking/recipes-connectivity/ez-ipupdate/files/conf_file.c.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/ez-ipupdate/files/conf_file.c.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/ez-ipupdate/files/conf_file.c.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/ez-ipupdate/files/wformat.patch b/meta-openembedded/meta-networking/recipes-connectivity/ez-ipupdate/files/wformat.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/ez-ipupdate/files/wformat.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/ez-ipupdate/files/wformat.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/0001-rlm_mschap-Use-includedir-instead-of-hardcoding-usr-.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius
rename to meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-avoid-searching-host-dirs.patch b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-avoid-searching-host-dirs.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-avoid-searching-host-dirs.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-avoid-searching-host-dirs.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-configure.ac-add-option-for-libcap.patch b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-configure.ac-add-option-for-libcap.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-configure.ac-add-option-for-libcap.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-configure.ac-add-option-for-libcap.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-configure.ac-allow-cross-compilation.patch b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-configure.ac-allow-cross-compilation.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-configure.ac-allow-cross-compilation.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-configure.ac-allow-cross-compilation.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-enble-user-in-conf.patch b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-enble-user-in-conf.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-enble-user-in-conf.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-enble-user-in-conf.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-fix-error-for-expansion-of-macro.patch b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-fix-error-for-expansion-of-macro.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-fix-error-for-expansion-of-macro.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-fix-error-for-expansion-of-macro.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-fix-issues-related-to-m4-include-path.patch b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-fix-issues-related-to-m4-include-path.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-fix-issues-related-to-m4-include-path.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-fix-issues-related-to-m4-include-path.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-fix-quoting-for-BUILT_WITH.patch b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-fix-quoting-for-BUILT_WITH.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-fix-quoting-for-BUILT_WITH.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-fix-quoting-for-BUILT_WITH.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-libtool-detection.patch b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-libtool-detection.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-libtool-detection.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-libtool-detection.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-libtool-do-not-use-jlibtool.patch b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-libtool-do-not-use-jlibtool.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-libtool-do-not-use-jlibtool.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-libtool-do-not-use-jlibtool.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-rlm_python-add-PY_INC_DIR.patch b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-rlm_python-add-PY_INC_DIR.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-rlm_python-add-PY_INC_DIR.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/freeradius-rlm_python-add-PY_INC_DIR.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/radiusd-volatiles.conf b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/radiusd-volatiles.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/radiusd-volatiles.conf
rename to meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/radiusd-volatiles.conf
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/radiusd.service b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/radiusd.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/radiusd.service
rename to meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/radiusd.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/volatiles.58_radiusd b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/volatiles.58_radiusd
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/volatiles.58_radiusd
rename to meta-openembedded/meta-networking/recipes-connectivity/freeradius/files/volatiles.58_radiusd
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.15.bb b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.15.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.15.bb
rename to meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.15.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/0001-rcp-fix-to-work-with-large-files.patch b/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/0001-rcp-fix-to-work-with-large-files.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/0001-rcp-fix-to-work-with-large-files.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/0001-rcp-fix-to-work-with-large-files.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch b/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch b/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0003-wchar.patch b/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0003-wchar.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0003-wchar.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0003-wchar.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/inetutils-1.9-PATH_PROCNET_DEV.patch b/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/inetutils-1.9-PATH_PROCNET_DEV.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/inetutils-1.9-PATH_PROCNET_DEV.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/inetutils-1.9-PATH_PROCNET_DEV.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/inetutils-only-check-pam_appl.h-when-pam-enabled.patch b/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/inetutils-only-check-pam_appl.h-when-pam-enabled.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/inetutils-only-check-pam_appl.h-when-pam-enabled.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/inetutils-only-check-pam_appl.h-when-pam-enabled.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/rexec.xinetd.inetutils b/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/rexec.xinetd.inetutils
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/rexec.xinetd.inetutils
rename to meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/rexec.xinetd.inetutils
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/rlogin.xinetd.inetutils b/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/rlogin.xinetd.inetutils
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/rlogin.xinetd.inetutils
rename to meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/rlogin.xinetd.inetutils
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/rsh.xinetd.inetutils b/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/rsh.xinetd.inetutils
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/rsh.xinetd.inetutils
rename to meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/rsh.xinetd.inetutils
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/telnet.xinetd.inetutils b/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/telnet.xinetd.inetutils
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/telnet.xinetd.inetutils
rename to meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/telnet.xinetd.inetutils
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/tftpd.xinetd.inetutils b/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/tftpd.xinetd.inetutils
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/tftpd.xinetd.inetutils
rename to meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/tftpd.xinetd.inetutils
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/version.patch b/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/version.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/version.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/version.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb b/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb
rename to meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/lftp/files/fix-gcc-6-conflicts-signbit.patch b/meta-openembedded/meta-networking/recipes-connectivity/lftp/files/fix-gcc-6-conflicts-signbit.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/lftp/files/fix-gcc-6-conflicts-signbit.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/lftp/files/fix-gcc-6-conflicts-signbit.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/lftp/lftp_4.7.7.bb b/meta-openembedded/meta-networking/recipes-connectivity/lftp/lftp_4.7.7.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/lftp/lftp_4.7.7.bb
rename to meta-openembedded/meta-networking/recipes-connectivity/lftp/lftp_4.7.7.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb b/meta-openembedded/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb
rename to meta-openembedded/meta-networking/recipes-connectivity/libdnet/libdnet_1.12.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.8.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.8.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.8.0.bb
rename to meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.8.0.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.0.bb
rename to meta-openembedded/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.0.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.2.8.bb b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.2.8.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.2.8.bb
rename to meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.2.8.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Do-not-create-settings-settings-property-documentati.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Do-not-create-settings-settings-property-documentati.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Do-not-create-settings-settings-property-documentati.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Do-not-create-settings-settings-property-documentati.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-musl-basic.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-musl-basic.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-musl-basic.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-musl-basic.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-musl-dlopen-configure-ac.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-musl-dlopen-configure-ac.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-musl-dlopen-configure-ac.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-musl-dlopen-configure-ac.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-network-support.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-network-support.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-network-support.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-network-support.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-process-util.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-process-util.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-process-util.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-process-util.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0005-musl-avoid-further-conflicts-by-including-net-ethern.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0005-musl-avoid-further-conflicts-by-including-net-ethern.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0005-musl-avoid-further-conflicts-by-including-net-ethern.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0005-musl-avoid-further-conflicts-by-including-net-ethern.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0006-Add-a-strndupa-replacement-for-musl.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0006-Add-a-strndupa-replacement-for-musl.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0006-Add-a-strndupa-replacement-for-musl.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0006-Add-a-strndupa-replacement-for-musl.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.10.6.bb b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.10.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.10.6.bb
rename to meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.10.6.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb
rename to meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/python-networkmanager/python-networkmanager_2.0.1.bb b/meta-openembedded/meta-networking/recipes-connectivity/python-networkmanager/python-networkmanager_2.0.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/python-networkmanager/python-networkmanager_2.0.1.bb
rename to meta-openembedded/meta-networking/recipes-connectivity/python-networkmanager/python-networkmanager_2.0.1.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/rdate/rdate/0001-rdate-define-logwtmp-on-libc-glibc.patch b/meta-openembedded/meta-networking/recipes-connectivity/rdate/rdate/0001-rdate-define-logwtmp-on-libc-glibc.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/rdate/rdate/0001-rdate-define-logwtmp-on-libc-glibc.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/rdate/rdate/0001-rdate-define-logwtmp-on-libc-glibc.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/rdate/rdate/0001-src-rdate-Fix-printf-format-errors.patch b/meta-openembedded/meta-networking/recipes-connectivity/rdate/rdate/0001-src-rdate-Fix-printf-format-errors.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/rdate/rdate/0001-src-rdate-Fix-printf-format-errors.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/rdate/rdate/0001-src-rdate-Fix-printf-format-errors.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/rdate/rdate_1.5.bb b/meta-openembedded/meta-networking/recipes-connectivity/rdate/rdate_1.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/rdate/rdate_1.5.bb
rename to meta-openembedded/meta-networking/recipes-connectivity/rdate/rdate_1.5.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-bb-build.patch b/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-bb-build.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-bb-build.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-bb-build.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-bison.patch b/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-bison.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-bison.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-bison.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-cleanup.patch b/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-cleanup.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-cleanup.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-cleanup.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-fix-msgsndnotify-loop.patch b/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-fix-msgsndnotify-loop.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-fix-msgsndnotify-loop.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-fix-msgsndnotify-loop.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-hardlink.patch b/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-hardlink.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-hardlink.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-hardlink.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-lfs.patch b/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-lfs.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-lfs.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-lfs.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-links.patch b/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-links.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-links.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-links.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-linux.patch b/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-linux.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-linux.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-linux.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-makefile-add-ldflags.patch b/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-makefile-add-ldflags.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-makefile-add-ldflags.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-makefile-add-ldflags.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-maxargs.patch b/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-maxargs.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-maxargs.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-maxargs.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-mkstemp.patch b/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-mkstemp.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-mkstemp.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-mkstemp.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-oldpath.patch b/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-oldpath.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-oldpath.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-oldpath.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-ssh.patch b/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-ssh.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-ssh.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-ssh.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-stat64.patch b/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-stat64.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-stat64.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-stat64.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-svr4.patch b/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-svr4.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-svr4.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-svr4.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-varargs.patch b/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-varargs.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-varargs.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist-6.1.5/rdist-6.1.5-varargs.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb b/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb
rename to meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd/0001-rtnl_flush-Error-on-failed-write.patch b/meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd/0001-rtnl_flush-Error-on-failed-write.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd/0001-rtnl_flush-Error-on-failed-write.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd/0001-rtnl_flush-Error-on-failed-write.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd_git.bb
rename to meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd_git.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0006-avoid-using-colon-in-the-checking-msg.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0006-avoid-using-colon-in-the-checking-msg.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0006-avoid-using-colon-in-the-checking-msg.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0006-avoid-using-colon-in-the-checking-msg.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/16-do-not-check-xsltproc-manpages.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/16-do-not-check-xsltproc-manpages.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/16-do-not-check-xsltproc-manpages.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/samba/samba/16-do-not-check-xsltproc-manpages.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/20-do-not-import-target-module-while-cross-compile.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/20-do-not-import-target-module-while-cross-compile.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/20-do-not-import-target-module-while-cross-compile.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/samba/samba/20-do-not-import-target-module-while-cross-compile.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/21-add-config-option-without-valgrind.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/21-add-config-option-without-valgrind.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/21-add-config-option-without-valgrind.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/samba/samba/21-add-config-option-without-valgrind.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/dnsserver-4.7.0.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/dnsserver-4.7.0.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/dnsserver-4.7.0.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/samba/samba/dnsserver-4.7.0.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/glibc_only.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/glibc_only.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/glibc_only.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/samba/samba/glibc_only.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/iconv-4.7.0.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/iconv-4.7.0.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/iconv-4.7.0.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/samba/samba/iconv-4.7.0.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/netdb_defines.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/netdb_defines.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/netdb_defines.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/samba/samba/netdb_defines.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/samba-4.3.9-remove-getpwent_r.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/samba-4.3.9-remove-getpwent_r.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/samba-4.3.9-remove-getpwent_r.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/samba/samba/samba-4.3.9-remove-getpwent_r.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/samba-pam.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/samba-pam.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/samba-pam.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/samba/samba/samba-pam.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/smb_conf-4.7.0.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/smb_conf-4.7.0.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/smb_conf-4.7.0.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/samba/samba/smb_conf-4.7.0.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/volatiles.03_samba b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/volatiles.03_samba
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/volatiles.03_samba
rename to meta-openembedded/meta-networking/recipes-connectivity/samba/samba/volatiles.03_samba
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.7.6.bb b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.7.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.7.6.bb
rename to meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.7.6.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/sethdlc/files/sethdlc-fix-host-contamination.patch b/meta-openembedded/meta-networking/recipes-connectivity/sethdlc/files/sethdlc-fix-host-contamination.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/sethdlc/files/sethdlc-fix-host-contamination.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/sethdlc/files/sethdlc-fix-host-contamination.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/sethdlc/sethdlc.bb b/meta-openembedded/meta-networking/recipes-connectivity/sethdlc/sethdlc.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/sethdlc/sethdlc.bb
rename to meta-openembedded/meta-networking/recipes-connectivity/sethdlc/sethdlc.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/snort/snort/0001-fix-do_package-failed-since-snort-2.9.7.0.patch b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort/0001-fix-do_package-failed-since-snort-2.9.7.0.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/snort/snort/0001-fix-do_package-failed-since-snort-2.9.7.0.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/snort/snort/0001-fix-do_package-failed-since-snort-2.9.7.0.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/snort/snort/0001-libpcap-search-sysroot-for-headers.patch b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort/0001-libpcap-search-sysroot-for-headers.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/snort/snort/0001-libpcap-search-sysroot-for-headers.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/snort/snort/0001-libpcap-search-sysroot-for-headers.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/snort/snort/disable-dap-address-space-id.patch b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort/disable-dap-address-space-id.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/snort/snort/disable-dap-address-space-id.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/snort/snort/disable-dap-address-space-id.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/snort/snort/disable-daq-flow-id.patch b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort/disable-daq-flow-id.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/snort/snort/disable-daq-flow-id.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/snort/snort/disable-daq-flow-id.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/snort/snort/disable-daq-verdict-retry.patch b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort/disable-daq-verdict-retry.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/snort/snort/disable-daq-verdict-retry.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/snort/snort/disable-daq-verdict-retry.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/snort/snort/disable-inaddr-none.patch b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort/disable-inaddr-none.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/snort/snort/disable-inaddr-none.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/snort/snort/disable-inaddr-none.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/snort/snort/fix-host-contamination-when-enable-static-daq.patch b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort/fix-host-contamination-when-enable-static-daq.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/snort/snort/fix-host-contamination-when-enable-static-daq.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/snort/snort/fix-host-contamination-when-enable-static-daq.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/snort/snort/snort.init b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort/snort.init
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/snort/snort/snort.init
rename to meta-openembedded/meta-networking/recipes-connectivity/snort/snort/snort.init
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb
rename to meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0001-optimize-boot.patch b/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0001-optimize-boot.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0001-optimize-boot.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0001-optimize-boot.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0002-lp1044361.patch b/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0002-lp1044361.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0002-lp1044361.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0002-lp1044361.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0003-fix-typeerror-on-error.patch b/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0003-fix-typeerror-on-error.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0003-fix-typeerror-on-error.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0003-fix-typeerror-on-error.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0004-lp1039729.patch b/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0004-lp1039729.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0004-lp1039729.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0004-lp1039729.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0005-lp1191197.patch b/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0005-lp1191197.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0005-lp1191197.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/0005-lp1191197.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/setup-add-an-option-to-specify-iptables-location.patch b/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/setup-add-an-option-to-specify-iptables-location.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/setup-add-an-option-to-specify-iptables-location.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/setup-add-an-option-to-specify-iptables-location.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/setup-only-make-one-reference-to-env.patch b/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/setup-only-make-one-reference-to-env.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/setup-only-make-one-reference-to-env.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw/setup-only-make-one-reference-to-env.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb b/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb
rename to meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw_0.33.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/vlan/vlan-1.9/0001-Add-printf-format-and-silence-format-security-warnin.patch b/meta-openembedded/meta-networking/recipes-connectivity/vlan/vlan-1.9/0001-Add-printf-format-and-silence-format-security-warnin.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/vlan/vlan-1.9/0001-Add-printf-format-and-silence-format-security-warnin.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/vlan/vlan-1.9/0001-Add-printf-format-and-silence-format-security-warnin.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/vlan/vlan-1.9/no-HOME-includes.patch b/meta-openembedded/meta-networking/recipes-connectivity/vlan/vlan-1.9/no-HOME-includes.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/vlan/vlan-1.9/no-HOME-includes.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/vlan/vlan-1.9/no-HOME-includes.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/vlan/vlan_1.9.bb b/meta-openembedded/meta-networking/recipes-connectivity/vlan/vlan_1.9.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/vlan/vlan_1.9.bb
rename to meta-openembedded/meta-networking/recipes-connectivity/vlan/vlan_1.9.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/0001-search-for-log-help-in-build-dir.patch b/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/0001-search-for-log-help-in-build-dir.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/0001-search-for-log-help-in-build-dir.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/0001-search-for-log-help-in-build-dir.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/0002-Fix-vpnc-install-for-cross-compile.patch b/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/0002-Fix-vpnc-install-for-cross-compile.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/0002-Fix-vpnc-install-for-cross-compile.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/0002-Fix-vpnc-install-for-cross-compile.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/0003-error.h-is-specific-to-glibc-on-linux.patch b/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/0003-error.h-is-specific-to-glibc-on-linux.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/0003-error.h-is-specific-to-glibc-on-linux.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/0003-error.h-is-specific-to-glibc-on-linux.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/0004-Use-pkgconfig-instead-of-libgcrypt-config.patch b/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/0004-Use-pkgconfig-instead-of-libgcrypt-config.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/0004-Use-pkgconfig-instead-of-libgcrypt-config.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/0004-Use-pkgconfig-instead-of-libgcrypt-config.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/0005-include-sys-ttydefaults.h-for-CEOT-definition.patch b/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/0005-include-sys-ttydefaults.h-for-CEOT-definition.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/0005-include-sys-ttydefaults.h-for-CEOT-definition.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/0005-include-sys-ttydefaults.h-for-CEOT-definition.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/0006-sysdep-Add-header-include-sequence-to-adjust-for-mus.patch b/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/0006-sysdep-Add-header-include-sequence-to-adjust-for-mus.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/0006-sysdep-Add-header-include-sequence-to-adjust-for-mus.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/0006-sysdep-Add-header-include-sequence-to-adjust-for-mus.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/0007-add-error-API-when-error.h-is-not-on-platform.patch b/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/0007-add-error-API-when-error.h-is-not-on-platform.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/0007-add-error-API-when-error.h-is-not-on-platform.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/0007-add-error-API-when-error.h-is-not-on-platform.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/0008-include-sysdep.h-before-net-if_tun.h.patch b/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/0008-include-sysdep.h-before-net-if_tun.h.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/0008-include-sysdep.h-before-net-if_tun.h.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/0008-include-sysdep.h-before-net-if_tun.h.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/0009-reduce-lifetime-value.patch b/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/0009-reduce-lifetime-value.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/0009-reduce-lifetime-value.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/0009-reduce-lifetime-value.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/default.conf b/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/default.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/default.conf
rename to meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/default.conf
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/long-help b/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/long-help
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/long-help
rename to meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc/long-help
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb b/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb
rename to meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2016.06.10.bb b/meta-openembedded/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2016.06.10.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2016.06.10.bb
rename to meta-openembedded/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2016.06.10.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/files/0001-fix-no-rule-to-make-cyassl-options.h.patch b/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/files/0001-fix-no-rule-to-make-cyassl-options.h.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/files/0001-fix-no-rule-to-make-cyassl-options.h.patch
rename to meta-openembedded/meta-networking/recipes-connectivity/wolfssl/files/0001-fix-no-rule-to-make-cyassl-options.h.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_3.12.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_3.12.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_3.12.0.bb
rename to meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_3.12.0.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp/0001-argz.h-fix-musl-compile-add-missing-defines.patch b/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp/0001-argz.h-fix-musl-compile-add-missing-defines.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp/0001-argz.h-fix-musl-compile-add-missing-defines.patch
rename to meta-openembedded/meta-networking/recipes-daemons/atftp/atftp/0001-argz.h-fix-musl-compile-add-missing-defines.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp/0002-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch b/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp/0002-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp/0002-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch
rename to meta-openembedded/meta-networking/recipes-daemons/atftp/atftp/0002-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp/atftpd.service b/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp/atftpd.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp/atftpd.service
rename to meta-openembedded/meta-networking/recipes-daemons/atftp/atftp/atftpd.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp_git.bb b/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp_git.bb
rename to meta-openembedded/meta-networking/recipes-daemons/atftp/atftp_git.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/atftp/files/atftp-0.7-sorcerers_apprentice.patch b/meta-openembedded/meta-networking/recipes-daemons/atftp/files/atftp-0.7-sorcerers_apprentice.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/atftp/files/atftp-0.7-sorcerers_apprentice.patch
rename to meta-openembedded/meta-networking/recipes-daemons/atftp/files/atftp-0.7-sorcerers_apprentice.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/atftp/files/atftpd-0.7_circumvent_tftp_size_restrictions.patch b/meta-openembedded/meta-networking/recipes-daemons/atftp/files/atftpd-0.7_circumvent_tftp_size_restrictions.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/atftp/files/atftpd-0.7_circumvent_tftp_size_restrictions.patch
rename to meta-openembedded/meta-networking/recipes-daemons/atftp/files/atftpd-0.7_circumvent_tftp_size_restrictions.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/atftp/files/atftpd-0.7_unprotected_assignments_crash.patch b/meta-openembedded/meta-networking/recipes-daemons/atftp/files/atftpd-0.7_unprotected_assignments_crash.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/atftp/files/atftpd-0.7_unprotected_assignments_crash.patch
rename to meta-openembedded/meta-networking/recipes-daemons/atftp/files/atftpd-0.7_unprotected_assignments_crash.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/atftp/files/atftpd.init b/meta-openembedded/meta-networking/recipes-daemons/atftp/files/atftpd.init
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/atftp/files/atftpd.init
rename to meta-openembedded/meta-networking/recipes-daemons/atftp/files/atftpd.init
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch
rename to meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch
rename to meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch
rename to meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/add-the-needed-stdarg.h.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/add-the-needed-stdarg.h.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/add-the-needed-stdarg.h.patch
rename to meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/add-the-needed-stdarg.h.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-do-not-check-for-modprobe.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-do-not-check-for-modprobe.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-do-not-check-for-modprobe.patch
rename to meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-do-not-check-for-modprobe.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-fix-lib-deps.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-fix-lib-deps.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-fix-lib-deps.patch
rename to meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-fix-lib-deps.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-include-linux-nfs.h-directly-in-rpc_sub.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-include-linux-nfs.h-directly-in-rpc_sub.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-include-linux-nfs.h-directly-in-rpc_sub.patch
rename to meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-include-linux-nfs.h-directly-in-rpc_sub.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.1.2-libtirpc-as-need.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.1.2-libtirpc-as-need.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.1.2-libtirpc-as-need.patch
rename to meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.1.2-libtirpc-as-need.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/cross.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/cross.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/cross.patch
rename to meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/cross.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/fix-the-YACC-rule-to-fix-a-building-failure.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/fix-the-YACC-rule-to-fix-a-building-failure.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/fix-the-YACC-rule-to-fix-a-building-failure.patch
rename to meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/fix-the-YACC-rule-to-fix-a-building-failure.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/fix_disable_ldap.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/fix_disable_ldap.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/fix_disable_ldap.patch
rename to meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/fix_disable_ldap.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/force-STRIP-to-emtpy.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/force-STRIP-to-emtpy.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/force-STRIP-to-emtpy.patch
rename to meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/force-STRIP-to-emtpy.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/libtirpc.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/libtirpc.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/libtirpc.patch
rename to meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/libtirpc.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/no-bash.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/no-bash.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/no-bash.patch
rename to meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/no-bash.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/pkgconfig-libnsl.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/pkgconfig-libnsl.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/pkgconfig-libnsl.patch
rename to meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/pkgconfig-libnsl.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/remove-bashism.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/remove-bashism.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/remove-bashism.patch
rename to meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/remove-bashism.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/using-pkg-config-to-detect-libxml-2.0-and-krb5.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/using-pkg-config-to-detect-libxml-2.0-and-krb5.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/using-pkg-config-to-detect-libxml-2.0-and-krb5.patch
rename to meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/using-pkg-config-to-detect-libxml-2.0-and-krb5.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.2.bb b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.2.bb
rename to meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.2.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/Fix-hardcoded-libdir.patch b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/Fix-hardcoded-libdir.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/Fix-hardcoded-libdir.patch
rename to meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/Fix-hardcoded-libdir.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/avoid-to-call-AC_TRY_RUN.patch b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/avoid-to-call-AC_TRY_RUN.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/avoid-to-call-AC_TRY_RUN.patch
rename to meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/avoid-to-call-AC_TRY_RUN.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/debian_patches_0009_sasldb_al.diff b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/debian_patches_0009_sasldb_al.diff
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/debian_patches_0009_sasldb_al.diff
rename to meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/debian_patches_0009_sasldb_al.diff
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/debian_patches_0014_avoid_pic_overwrite.diff b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/debian_patches_0014_avoid_pic_overwrite.diff
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/debian_patches_0014_avoid_pic_overwrite.diff
rename to meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/debian_patches_0014_avoid_pic_overwrite.diff
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/sasl.h-include-stddef.h-for-size_t-on-NetBSD.patch b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/sasl.h-include-stddef.h-for-size_t-on-NetBSD.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/sasl.h-include-stddef.h-for-size_t-on-NetBSD.patch
rename to meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/sasl.h-include-stddef.h-for-size_t-on-NetBSD.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/saslauthd.conf b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/saslauthd.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/saslauthd.conf
rename to meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/saslauthd.conf
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/saslauthd.service b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/saslauthd.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/saslauthd.service
rename to meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl/saslauthd.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb
rename to meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/dnrd/dnrd/dnrd.conf.sample b/meta-openembedded/meta-networking/recipes-daemons/dnrd/dnrd/dnrd.conf.sample
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/dnrd/dnrd/dnrd.conf.sample
rename to meta-openembedded/meta-networking/recipes-daemons/dnrd/dnrd/dnrd.conf.sample
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/dnrd/dnrd/dnrd.init b/meta-openembedded/meta-networking/recipes-daemons/dnrd/dnrd/dnrd.init
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/dnrd/dnrd/dnrd.init
rename to meta-openembedded/meta-networking/recipes-daemons/dnrd/dnrd/dnrd.init
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/dnrd/dnrd/dnrd.service b/meta-openembedded/meta-networking/recipes-daemons/dnrd/dnrd/dnrd.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/dnrd/dnrd/dnrd.service
rename to meta-openembedded/meta-networking/recipes-daemons/dnrd/dnrd/dnrd.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/igmpproxy/igmpproxy/0001-src-igmpproxy.h-Include-sys-types.h-for-u_short-u_in.patch b/meta-openembedded/meta-networking/recipes-daemons/igmpproxy/igmpproxy/0001-src-igmpproxy.h-Include-sys-types.h-for-u_short-u_in.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/igmpproxy/igmpproxy/0001-src-igmpproxy.h-Include-sys-types.h-for-u_short-u_in.patch
rename to meta-openembedded/meta-networking/recipes-daemons/igmpproxy/igmpproxy/0001-src-igmpproxy.h-Include-sys-types.h-for-u_short-u_in.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.1.bb b/meta-openembedded/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.1.bb
rename to meta-openembedded/meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.1.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/0001-Respect-flags-from-env.patch b/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/0001-Respect-flags-from-env.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/0001-Respect-flags-from-env.patch
rename to meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/0001-Respect-flags-from-env.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/0001-read-returns-ssize_t.patch b/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/0001-read-returns-ssize_t.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/0001-read-returns-ssize_t.patch
rename to meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/0001-read-returns-ssize_t.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/0001-usl_timer-Check-for-return-value-of-write-API.patch b/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/0001-usl_timer-Check-for-return-value-of-write-API.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/0001-usl_timer-Check-for-return-value-of-write-API.patch
rename to meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/0001-usl_timer-Check-for-return-value-of-write-API.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/0002-Mark-first-element-of-a-string-as-null.patch b/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/0002-Mark-first-element-of-a-string-as-null.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/0002-Mark-first-element-of-a-string-as-null.patch
rename to meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/0002-Mark-first-element-of-a-string-as-null.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/0002-link-with-libtirpc.patch b/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/0002-link-with-libtirpc.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/0002-link-with-libtirpc.patch
rename to meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/0002-link-with-libtirpc.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/0003-cli-Mark-return-of-strtol-as-long-int.patch b/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/0003-cli-Mark-return-of-strtol-as-long-int.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/0003-cli-Mark-return-of-strtol-as-long-int.patch
rename to meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/0003-cli-Mark-return-of-strtol-as-long-int.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/0003-musl-fixes.patch b/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/0003-musl-fixes.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/0003-musl-fixes.patch
rename to meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/0003-musl-fixes.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/always_syslog.patch b/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/always_syslog.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/always_syslog.patch
rename to meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/always_syslog.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/ippool.service b/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/ippool.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/ippool.service
rename to meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/ippool.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/ippool_init.d.patch b/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/ippool_init.d.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/ippool_init.d.patch
rename to meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/ippool_init.d.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/ippool_parallel_make_and_pic.patch b/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/ippool_parallel_make_and_pic.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/ippool_parallel_make_and_pic.patch
rename to meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/ippool_parallel_make_and_pic.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/ippool_usl_timer.patch b/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/ippool_usl_timer.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/ippool_usl_timer.patch
rename to meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/ippool_usl_timer.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/makefile-add-ldflags.patch b/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/makefile-add-ldflags.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/makefile-add-ldflags.patch
rename to meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/makefile-add-ldflags.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/runtest.sh b/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/runtest.sh
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/runtest.sh
rename to meta-openembedded/meta-networking/recipes-daemons/ippool/ippool/runtest.sh
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool_1.3.bb b/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool_1.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool_1.3.bb
rename to meta-openembedded/meta-networking/recipes-daemons/ippool/ippool_1.3.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-libopeniscsiusr-Include-limit.h-for-PATH_MAX.patch b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-libopeniscsiusr-Include-limit.h-for-PATH_MAX.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-libopeniscsiusr-Include-limit.h-for-PATH_MAX.patch
rename to meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-libopeniscsiusr-Include-limit.h-for-PATH_MAX.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-qedi.c-Removed-unused-linux-ethtool.h.patch b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-qedi.c-Removed-unused-linux-ethtool.h.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-qedi.c-Removed-unused-linux-ethtool.h.patch
rename to meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-qedi.c-Removed-unused-linux-ethtool.h.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-idbm.c-Include-fcnl.h-for-O_RDWR-and-O_CREAT-definit.patch b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-idbm.c-Include-fcnl.h-for-O_RDWR-and-O_CREAT-definit.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-idbm.c-Include-fcnl.h-for-O_RDWR-and-O_CREAT-definit.patch
rename to meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-idbm.c-Include-fcnl.h-for-O_RDWR-and-O_CREAT-definit.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-libopeniscsiusr-Add-CFLAGS-to-linker-cmdline.patch b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-libopeniscsiusr-Add-CFLAGS-to-linker-cmdline.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-libopeniscsiusr-Add-CFLAGS-to-linker-cmdline.patch
rename to meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-libopeniscsiusr-Add-CFLAGS-to-linker-cmdline.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0003-bnx2x.c-Reorder-the-includes-to-avoid-duplicate-defi.patch b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0003-bnx2x.c-Reorder-the-includes-to-avoid-duplicate-defi.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0003-bnx2x.c-Reorder-the-includes-to-avoid-duplicate-defi.patch
rename to meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0003-bnx2x.c-Reorder-the-includes-to-avoid-duplicate-defi.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0004-fwparam_ppc.c-Do-not-use-__compar_fn_t.patch b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0004-fwparam_ppc.c-Do-not-use-__compar_fn_t.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0004-fwparam_ppc.c-Do-not-use-__compar_fn_t.patch
rename to meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0004-fwparam_ppc.c-Do-not-use-__compar_fn_t.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/99_iscsi-initiator-utils b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/99_iscsi-initiator-utils
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/99_iscsi-initiator-utils
rename to meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/99_iscsi-initiator-utils
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/initd.debian b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/initd.debian
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/initd.debian
rename to meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/initd.debian
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator
rename to meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-targets.service b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-targets.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-targets.service
rename to meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-targets.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator.service b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator.service
rename to meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/set_initiatorname b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/set_initiatorname
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/set_initiatorname
rename to meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/set_initiatorname
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.876.bb b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.876.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.876.bb
rename to meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.876.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_1.4.2.bb b/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_1.4.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_1.4.2.bb
rename to meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_1.4.2.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/lldpd/files/lldpd.default b/meta-openembedded/meta-networking/recipes-daemons/lldpd/files/lldpd.default
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/lldpd/files/lldpd.default
rename to meta-openembedded/meta-networking/recipes-daemons/lldpd/files/lldpd.default
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/lldpd/files/lldpd.init.d b/meta-openembedded/meta-networking/recipes-daemons/lldpd/files/lldpd.init.d
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/lldpd/files/lldpd.init.d
rename to meta-openembedded/meta-networking/recipes-daemons/lldpd/files/lldpd.init.d
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/lldpd/files/src-daemon-lldpd.service.in-Use-fixed-path-for-mkdir.patch b/meta-openembedded/meta-networking/recipes-daemons/lldpd/files/src-daemon-lldpd.service.in-Use-fixed-path-for-mkdir.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/lldpd/files/src-daemon-lldpd.service.in-Use-fixed-path-for-mkdir.patch
rename to meta-openembedded/meta-networking/recipes-daemons/lldpd/files/src-daemon-lldpd.service.in-Use-fixed-path-for-mkdir.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/lldpd/lldpd_0.9.8.bb b/meta-openembedded/meta-networking/recipes-daemons/lldpd/lldpd_0.9.8.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/lldpd/lldpd_0.9.8.bb
rename to meta-openembedded/meta-networking/recipes-daemons/lldpd/lldpd_0.9.8.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/ncftp/ncftp/ncftp-configure-use-BUILD_CC-for-ccdv.patch b/meta-openembedded/meta-networking/recipes-daemons/ncftp/ncftp/ncftp-configure-use-BUILD_CC-for-ccdv.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/ncftp/ncftp/ncftp-configure-use-BUILD_CC-for-ccdv.patch
rename to meta-openembedded/meta-networking/recipes-daemons/ncftp/ncftp/ncftp-configure-use-BUILD_CC-for-ccdv.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/ncftp/ncftp/unistd.patch b/meta-openembedded/meta-networking/recipes-daemons/ncftp/ncftp/unistd.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/ncftp/ncftp/unistd.patch
rename to meta-openembedded/meta-networking/recipes-daemons/ncftp/ncftp/unistd.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/ncftp/ncftp_3.2.6.bb b/meta-openembedded/meta-networking/recipes-daemons/ncftp/ncftp_3.2.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/ncftp/ncftp_3.2.6.bb
rename to meta-openembedded/meta-networking/recipes-daemons/ncftp/ncftp_3.2.6.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/0001-Fix-build-failures-with-gcc7.patch b/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/0001-Fix-build-failures-with-gcc7.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/0001-Fix-build-failures-with-gcc7.patch
rename to meta-openembedded/meta-networking/recipes-daemons/openhpi/files/0001-Fix-build-failures-with-gcc7.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/0001-ipmidirect-Replace-__STRING.patch b/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/0001-ipmidirect-Replace-__STRING.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/0001-ipmidirect-Replace-__STRING.patch
rename to meta-openembedded/meta-networking/recipes-daemons/openhpi/files/0001-ipmidirect-Replace-__STRING.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/0001-plugins-Check-for-PTHREAD_RECURSIVE_MUTEX_INITIALIZE.patch b/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/0001-plugins-Check-for-PTHREAD_RECURSIVE_MUTEX_INITIALIZE.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/0001-plugins-Check-for-PTHREAD_RECURSIVE_MUTEX_INITIALIZE.patch
rename to meta-openembedded/meta-networking/recipes-daemons/openhpi/files/0001-plugins-Check-for-PTHREAD_RECURSIVE_MUTEX_INITIALIZE.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/c++11.patch b/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/c++11.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/c++11.patch
rename to meta-openembedded/meta-networking/recipes-daemons/openhpi/files/c++11.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/clang-c++11.patch b/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/clang-c++11.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/clang-c++11.patch
rename to meta-openembedded/meta-networking/recipes-daemons/openhpi/files/clang-c++11.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/fix-narrowing-warning.patch b/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/fix-narrowing-warning.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/fix-narrowing-warning.patch
rename to meta-openembedded/meta-networking/recipes-daemons/openhpi/files/fix-narrowing-warning.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-add-libnetsnmp-when-link.patch b/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-add-libnetsnmp-when-link.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-add-libnetsnmp-when-link.patch
rename to meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-add-libnetsnmp-when-link.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-fix-alignment-issue.patch b/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-fix-alignment-issue.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-fix-alignment-issue.patch
rename to meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-fix-alignment-issue.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-fix-host-gcc.patch b/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-fix-host-gcc.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-fix-host-gcc.patch
rename to meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-fix-host-gcc.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-fix-testfail-errors.patch b/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-fix-testfail-errors.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-fix-testfail-errors.patch
rename to meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-fix-testfail-errors.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-glib-cross-compile.patch b/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-glib-cross-compile.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-glib-cross-compile.patch
rename to meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-glib-cross-compile.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-hpi-shell-thread-fix.patch b/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-hpi-shell-thread-fix.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-hpi-shell-thread-fix.patch
rename to meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-hpi-shell-thread-fix.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-invalide-session.patch b/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-invalide-session.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-invalide-session.patch
rename to meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-invalide-session.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-libxml2-cross-compile.patch b/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-libxml2-cross-compile.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-libxml2-cross-compile.patch
rename to meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-libxml2-cross-compile.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-linkfix.patch b/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-linkfix.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-linkfix.patch
rename to meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-linkfix.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-netsnmp-cross-compile.patch b/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-netsnmp-cross-compile.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-netsnmp-cross-compile.patch
rename to meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-netsnmp-cross-compile.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-sysfs-cross-compile.patch b/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-sysfs-cross-compile.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-sysfs-cross-compile.patch
rename to meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-sysfs-cross-compile.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-use-serial-tests-config-needed-by-ptest.patch b/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-use-serial-tests-config-needed-by-ptest.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-use-serial-tests-config-needed-by-ptest.patch
rename to meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi-use-serial-tests-config-needed-by-ptest.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi.init b/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi.init
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi.init
rename to meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpi.init
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpid.service b/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpid.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpid.service
rename to meta-openembedded/meta-networking/recipes-daemons/openhpi/files/openhpid.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/run-ptest b/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/run-ptest
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/run-ptest
rename to meta-openembedded/meta-networking/recipes-daemons/openhpi/files/run-ptest
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/openhpi_3.6.1.bb b/meta-openembedded/meta-networking/recipes-daemons/openhpi/openhpi_3.6.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/openhpi/openhpi_3.6.1.bb
rename to meta-openembedded/meta-networking/recipes-daemons/openhpi/openhpi_3.6.1.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Disable-format-overflow-if-supported-by-gc.patch b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Disable-format-overflow-if-supported-by-gc.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Disable-format-overflow-if-supported-by-gc.patch
rename to meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Disable-format-overflow-if-supported-by-gc.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Pass-linker-specific-options-with-Wl.patch b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Pass-linker-specific-options-with-Wl.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Pass-linker-specific-options-with-Wl.patch
rename to meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Pass-linker-specific-options-with-Wl.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0001-immpbe_dump.cc-Use-sys-wait.h-instead-of-wait.h.patch b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0001-immpbe_dump.cc-Use-sys-wait.h-instead-of-wait.h.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0001-immpbe_dump.cc-Use-sys-wait.h-instead-of-wait.h.patch
rename to meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0001-immpbe_dump.cc-Use-sys-wait.h-instead-of-wait.h.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0001-src-Add-missing-header-limits.h-for-_POSIX_HOST_NAME.patch b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0001-src-Add-missing-header-limits.h-for-_POSIX_HOST_NAME.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0001-src-Add-missing-header-limits.h-for-_POSIX_HOST_NAME.patch
rename to meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf/0001-src-Add-missing-header-limits.h-for-_POSIX_HOST_NAME.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.18.02.bb b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.18.02.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.18.02.bb
rename to meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.18.02.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/postfix/files/0001-Check-for-glibc-before-setting-CANT_USE_SEND_RECV_MS.patch b/meta-openembedded/meta-networking/recipes-daemons/postfix/files/0001-Check-for-glibc-before-setting-CANT_USE_SEND_RECV_MS.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/postfix/files/0001-Check-for-glibc-before-setting-CANT_USE_SEND_RECV_MS.patch
rename to meta-openembedded/meta-networking/recipes-daemons/postfix/files/0001-Check-for-glibc-before-setting-CANT_USE_SEND_RECV_MS.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/postfix/files/0001-makedefs-Use-native-compiler-to-build-makedefs.test.patch b/meta-openembedded/meta-networking/recipes-daemons/postfix/files/0001-makedefs-Use-native-compiler-to-build-makedefs.test.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/postfix/files/0001-makedefs-Use-native-compiler-to-build-makedefs.test.patch
rename to meta-openembedded/meta-networking/recipes-daemons/postfix/files/0001-makedefs-Use-native-compiler-to-build-makedefs.test.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/postfix/files/aliasesdb b/meta-openembedded/meta-networking/recipes-daemons/postfix/files/aliasesdb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/postfix/files/aliasesdb
rename to meta-openembedded/meta-networking/recipes-daemons/postfix/files/aliasesdb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/postfix/files/check_hostname.sh b/meta-openembedded/meta-networking/recipes-daemons/postfix/files/check_hostname.sh
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/postfix/files/check_hostname.sh
rename to meta-openembedded/meta-networking/recipes-daemons/postfix/files/check_hostname.sh
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/postfix/files/icu-config.patch b/meta-openembedded/meta-networking/recipes-daemons/postfix/files/icu-config.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/postfix/files/icu-config.patch
rename to meta-openembedded/meta-networking/recipes-daemons/postfix/files/icu-config.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/postfix/files/install.patch b/meta-openembedded/meta-networking/recipes-daemons/postfix/files/install.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/postfix/files/install.patch
rename to meta-openembedded/meta-networking/recipes-daemons/postfix/files/install.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/postfix/files/internal_recipient b/meta-openembedded/meta-networking/recipes-daemons/postfix/files/internal_recipient
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/postfix/files/internal_recipient
rename to meta-openembedded/meta-networking/recipes-daemons/postfix/files/internal_recipient
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/postfix/files/main.cf b/meta-openembedded/meta-networking/recipes-daemons/postfix/files/main.cf
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/postfix/files/main.cf
rename to meta-openembedded/meta-networking/recipes-daemons/postfix/files/main.cf
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/postfix/files/makedefs.patch b/meta-openembedded/meta-networking/recipes-daemons/postfix/files/makedefs.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/postfix/files/makedefs.patch
rename to meta-openembedded/meta-networking/recipes-daemons/postfix/files/makedefs.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/postfix/files/postfix b/meta-openembedded/meta-networking/recipes-daemons/postfix/files/postfix
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/postfix/files/postfix
rename to meta-openembedded/meta-networking/recipes-daemons/postfix/files/postfix
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/postfix/files/postfix-install.patch b/meta-openembedded/meta-networking/recipes-daemons/postfix/files/postfix-install.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/postfix/files/postfix-install.patch
rename to meta-openembedded/meta-networking/recipes-daemons/postfix/files/postfix-install.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/postfix/files/postfix.service b/meta-openembedded/meta-networking/recipes-daemons/postfix/files/postfix.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/postfix/files/postfix.service
rename to meta-openembedded/meta-networking/recipes-daemons/postfix/files/postfix.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix.inc b/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix.inc
rename to meta-openembedded/meta-networking/recipes-daemons/postfix/postfix.inc
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.2.2.bb b/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.2.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.2.2.bb
rename to meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.2.2.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/proftpd/files/basic.conf.patch b/meta-openembedded/meta-networking/recipes-daemons/proftpd/files/basic.conf.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/proftpd/files/basic.conf.patch
rename to meta-openembedded/meta-networking/recipes-daemons/proftpd/files/basic.conf.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch b/meta-openembedded/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch
rename to meta-openembedded/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/proftpd/files/close-RequireValidShell-check.patch b/meta-openembedded/meta-networking/recipes-daemons/proftpd/files/close-RequireValidShell-check.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/proftpd/files/close-RequireValidShell-check.patch
rename to meta-openembedded/meta-networking/recipes-daemons/proftpd/files/close-RequireValidShell-check.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/proftpd/files/contrib.patch b/meta-openembedded/meta-networking/recipes-daemons/proftpd/files/contrib.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/proftpd/files/contrib.patch
rename to meta-openembedded/meta-networking/recipes-daemons/proftpd/files/contrib.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/proftpd/files/default b/meta-openembedded/meta-networking/recipes-daemons/proftpd/files/default
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/proftpd/files/default
rename to meta-openembedded/meta-networking/recipes-daemons/proftpd/files/default
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/proftpd/files/proftpd-basic.init b/meta-openembedded/meta-networking/recipes-daemons/proftpd/files/proftpd-basic.init
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/proftpd/files/proftpd-basic.init
rename to meta-openembedded/meta-networking/recipes-daemons/proftpd/files/proftpd-basic.init
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/proftpd/files/proftpd.service b/meta-openembedded/meta-networking/recipes-daemons/proftpd/files/proftpd.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/proftpd/files/proftpd.service
rename to meta-openembedded/meta-networking/recipes-daemons/proftpd/files/proftpd.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb b/meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb
rename to meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd/ptpd-use-pkgconfig.patch b/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd/ptpd-use-pkgconfig.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd/ptpd-use-pkgconfig.patch
rename to meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd/ptpd-use-pkgconfig.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd/ptpd.conf b/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd/ptpd.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd/ptpd.conf
rename to meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd/ptpd.conf
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd/ptpd.service b/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd/ptpd.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd/ptpd.service
rename to meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd/ptpd.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb b/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb
rename to meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch b/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch
rename to meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch b/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch
rename to meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.42.bb b/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.42.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.42.bb
rename to meta-openembedded/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.42.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/radvd/files/radvd.default b/meta-openembedded/meta-networking/recipes-daemons/radvd/files/radvd.default
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/radvd/files/radvd.default
rename to meta-openembedded/meta-networking/recipes-daemons/radvd/files/radvd.default
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/radvd/files/radvd.init b/meta-openembedded/meta-networking/recipes-daemons/radvd/files/radvd.init
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/radvd/files/radvd.init
rename to meta-openembedded/meta-networking/recipes-daemons/radvd/files/radvd.init
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/radvd/files/radvd.service b/meta-openembedded/meta-networking/recipes-daemons/radvd/files/radvd.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/radvd/files/radvd.service
rename to meta-openembedded/meta-networking/recipes-daemons/radvd/files/radvd.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/radvd/files/volatiles.03_radvd b/meta-openembedded/meta-networking/recipes-daemons/radvd/files/volatiles.03_radvd
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/radvd/files/volatiles.03_radvd
rename to meta-openembedded/meta-networking/recipes-daemons/radvd/files/volatiles.03_radvd
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd.inc b/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd.inc
rename to meta-openembedded/meta-networking/recipes-daemons/radvd/radvd.inc
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd_2.17.bb b/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd_2.17.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd_2.17.bb
rename to meta-openembedded/meta-networking/recipes-daemons/radvd/radvd_2.17.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/0001-SquidNew-use-noexcept-instead-of-throw-for-C-11-comp.patch b/meta-openembedded/meta-networking/recipes-daemons/squid/files/0001-SquidNew-use-noexcept-instead-of-throw-for-C-11-comp.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/0001-SquidNew-use-noexcept-instead-of-throw-for-C-11-comp.patch
rename to meta-openembedded/meta-networking/recipes-daemons/squid/files/0001-SquidNew-use-noexcept-instead-of-throw-for-C-11-comp.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/0001-configure-Check-for-Wno-error-format-truncation-comp.patch b/meta-openembedded/meta-networking/recipes-daemons/squid/files/0001-configure-Check-for-Wno-error-format-truncation-comp.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/0001-configure-Check-for-Wno-error-format-truncation-comp.patch
rename to meta-openembedded/meta-networking/recipes-daemons/squid/files/0001-configure-Check-for-Wno-error-format-truncation-comp.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/0001-tools.cc-fixed-unused-result-warning.patch b/meta-openembedded/meta-networking/recipes-daemons/squid/files/0001-tools.cc-fixed-unused-result-warning.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/0001-tools.cc-fixed-unused-result-warning.patch
rename to meta-openembedded/meta-networking/recipes-daemons/squid/files/0001-tools.cc-fixed-unused-result-warning.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/Fix-flawed-dynamic-ldb-link-test-in-configure.patch b/meta-openembedded/meta-networking/recipes-daemons/squid/files/Fix-flawed-dynamic-ldb-link-test-in-configure.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/Fix-flawed-dynamic-ldb-link-test-in-configure.patch
rename to meta-openembedded/meta-networking/recipes-daemons/squid/files/Fix-flawed-dynamic-ldb-link-test-in-configure.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/Set-up-for-cross-compilation.patch b/meta-openembedded/meta-networking/recipes-daemons/squid/files/Set-up-for-cross-compilation.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/Set-up-for-cross-compilation.patch
rename to meta-openembedded/meta-networking/recipes-daemons/squid/files/Set-up-for-cross-compilation.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch b/meta-openembedded/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch
rename to meta-openembedded/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/gcc7-fixes.patch b/meta-openembedded/meta-networking/recipes-daemons/squid/files/gcc7-fixes.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/gcc7-fixes.patch
rename to meta-openembedded/meta-networking/recipes-daemons/squid/files/gcc7-fixes.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/run-ptest b/meta-openembedded/meta-networking/recipes-daemons/squid/files/run-ptest
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/run-ptest
rename to meta-openembedded/meta-networking/recipes-daemons/squid/files/run-ptest
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/set_sysroot_patch.patch b/meta-openembedded/meta-networking/recipes-daemons/squid/files/set_sysroot_patch.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/set_sysroot_patch.patch
rename to meta-openembedded/meta-networking/recipes-daemons/squid/files/set_sysroot_patch.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/squid-don-t-do-squid-conf-tests-at-build-time.patch b/meta-openembedded/meta-networking/recipes-daemons/squid/files/squid-don-t-do-squid-conf-tests-at-build-time.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/squid-don-t-do-squid-conf-tests-at-build-time.patch
rename to meta-openembedded/meta-networking/recipes-daemons/squid/files/squid-don-t-do-squid-conf-tests-at-build-time.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/squid-use-serial-tests-config-needed-by-ptest.patch b/meta-openembedded/meta-networking/recipes-daemons/squid/files/squid-use-serial-tests-config-needed-by-ptest.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/squid-use-serial-tests-config-needed-by-ptest.patch
rename to meta-openembedded/meta-networking/recipes-daemons/squid/files/squid-use-serial-tests-config-needed-by-ptest.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/volatiles.03_squid b/meta-openembedded/meta-networking/recipes-daemons/squid/files/volatiles.03_squid
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/volatiles.03_squid
rename to meta-openembedded/meta-networking/recipes-daemons/squid/files/volatiles.03_squid
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/squid_3.5.26.bb b/meta-openembedded/meta-networking/recipes-daemons/squid/squid_3.5.26.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/squid_3.5.26.bb
rename to meta-openembedded/meta-networking/recipes-daemons/squid/squid_3.5.26.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/0001-__progname-is-provided-by-libc.patch b/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/0001-__progname-is-provided-by-libc.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/0001-__progname-is-provided-by-libc.patch
rename to meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/0001-__progname-is-provided-by-libc.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/add-error-check-for-disk-filled-up.patch b/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/add-error-check-for-disk-filled-up.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/add-error-check-for-disk-filled-up.patch
rename to meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/add-error-check-for-disk-filled-up.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/default b/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/default
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/default
rename to meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/default
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/fix-writing-emtpy-file.patch b/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/fix-writing-emtpy-file.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/fix-writing-emtpy-file.patch
rename to meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/fix-writing-emtpy-file.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/init b/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/init
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/init
rename to meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/init
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftp-0.40-remap.patch b/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftp-0.40-remap.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftp-0.40-remap.patch
rename to meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftp-0.40-remap.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftp-0.42-tftpboot.patch b/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftp-0.42-tftpboot.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftp-0.42-tftpboot.patch
rename to meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftp-0.42-tftpboot.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftp-0.49-chk_retcodes.patch b/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftp-0.49-chk_retcodes.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftp-0.49-chk_retcodes.patch
rename to meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftp-0.49-chk_retcodes.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftp-0.49-cmd_arg.patch b/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftp-0.49-cmd_arg.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftp-0.49-cmd_arg.patch
rename to meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftp-0.49-cmd_arg.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-0.39-tzfix.patch b/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-0.39-tzfix.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-0.39-tzfix.patch
rename to meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-0.39-tzfix.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-0.49-fortify-strcpy-crash.patch b/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-0.49-fortify-strcpy-crash.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-0.49-fortify-strcpy-crash.patch
rename to meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-0.49-fortify-strcpy-crash.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-0.49-stats.patch b/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-0.49-stats.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-0.49-stats.patch
rename to meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-0.49-stats.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-5.2-pktinfo.patch b/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-5.2-pktinfo.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-5.2-pktinfo.patch
rename to meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-5.2-pktinfo.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-bug-fix-on-separated-CR-and-LF.patch b/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-bug-fix-on-separated-CR-and-LF.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-bug-fix-on-separated-CR-and-LF.patch
rename to meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftp-hpa-bug-fix-on-separated-CR-and-LF.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftp-xinetd b/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftp-xinetd
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftp-xinetd
rename to meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftp-xinetd
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftpd-hpa.service b/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftpd-hpa.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftpd-hpa.service
rename to meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftpd-hpa.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftpd-hpa.socket b/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftpd-hpa.socket
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftpd-hpa.socket
rename to meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/files/tftpd-hpa.socket
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb b/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb
rename to meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/vblade/files/cross.patch b/meta-openembedded/meta-networking/recipes-daemons/vblade/files/cross.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/vblade/files/cross.patch
rename to meta-openembedded/meta-networking/recipes-daemons/vblade/files/cross.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/vblade/files/makefile-add-ldflags.patch b/meta-openembedded/meta-networking/recipes-daemons/vblade/files/makefile-add-ldflags.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/vblade/files/makefile-add-ldflags.patch
rename to meta-openembedded/meta-networking/recipes-daemons/vblade/files/makefile-add-ldflags.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/vblade/files/vblade.conf b/meta-openembedded/meta-networking/recipes-daemons/vblade/files/vblade.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/vblade/files/vblade.conf
rename to meta-openembedded/meta-networking/recipes-daemons/vblade/files/vblade.conf
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/vblade/files/vblade.init b/meta-openembedded/meta-networking/recipes-daemons/vblade/files/vblade.init
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/vblade/files/vblade.init
rename to meta-openembedded/meta-networking/recipes-daemons/vblade/files/vblade.init
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/vblade/files/vblade.service b/meta-openembedded/meta-networking/recipes-daemons/vblade/files/vblade.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/vblade/files/vblade.service
rename to meta-openembedded/meta-networking/recipes-daemons/vblade/files/vblade.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/vblade/files/volatiles.99_vblade b/meta-openembedded/meta-networking/recipes-daemons/vblade/files/volatiles.99_vblade
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/vblade/files/volatiles.99_vblade
rename to meta-openembedded/meta-networking/recipes-daemons/vblade/files/volatiles.99_vblade
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/vblade/vblade_22.bb b/meta-openembedded/meta-networking/recipes-daemons/vblade/vblade_22.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/vblade/vblade_22.bb
rename to meta-openembedded/meta-networking/recipes-daemons/vblade/vblade_22.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/files/change-secure_chroot_dir.patch b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/files/change-secure_chroot_dir.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/files/change-secure_chroot_dir.patch
rename to meta-openembedded/meta-networking/recipes-daemons/vsftpd/files/change-secure_chroot_dir.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/files/init b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/files/init
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/files/init
rename to meta-openembedded/meta-networking/recipes-daemons/vsftpd/files/init
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/files/volatiles.99_vsftpd b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/files/volatiles.99_vsftpd
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/files/volatiles.99_vsftpd
rename to meta-openembedded/meta-networking/recipes-daemons/vsftpd/files/volatiles.99_vsftpd
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/files/vsftpd.conf b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/files/vsftpd.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/files/vsftpd.conf
rename to meta-openembedded/meta-networking/recipes-daemons/vsftpd/files/vsftpd.conf
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/files/vsftpd.ftpusers b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/files/vsftpd.ftpusers
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/files/vsftpd.ftpusers
rename to meta-openembedded/meta-networking/recipes-daemons/vsftpd/files/vsftpd.ftpusers
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/files/vsftpd.service b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/files/vsftpd.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/files/vsftpd.service
rename to meta-openembedded/meta-networking/recipes-daemons/vsftpd/files/vsftpd.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/files/vsftpd.user_list b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/files/vsftpd.user_list
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/files/vsftpd.user_list
rename to meta-openembedded/meta-networking/recipes-daemons/vsftpd/files/vsftpd.user_list
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch
rename to meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-sysdeputil.c-Fix-with-musl-which-does-not-have-utmpx.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-vsftpd-allow-sysinfo-in-the-seccomp-sandbox.patch b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-vsftpd-allow-sysinfo-in-the-seccomp-sandbox.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-vsftpd-allow-sysinfo-in-the-seccomp-sandbox.patch
rename to meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-vsftpd-allow-sysinfo-in-the-seccomp-sandbox.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/makefile-destdir.patch b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/makefile-destdir.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/makefile-destdir.patch
rename to meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/makefile-destdir.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/makefile-libs.patch b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/makefile-libs.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/makefile-libs.patch
rename to meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/makefile-libs.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/makefile-strip.patch b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/makefile-strip.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/makefile-strip.patch
rename to meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/makefile-strip.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/nopam-with-tcp_wrappers.patch b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/nopam-with-tcp_wrappers.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/nopam-with-tcp_wrappers.patch
rename to meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/nopam-with-tcp_wrappers.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/nopam.patch b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/nopam.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/nopam.patch
rename to meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/nopam.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/vsftpd-2.1.0-filter.patch b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/vsftpd-2.1.0-filter.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/vsftpd-2.1.0-filter.patch
rename to meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/vsftpd-2.1.0-filter.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/vsftpd-tcp_wrappers-support.patch b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/vsftpd-tcp_wrappers-support.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/vsftpd-tcp_wrappers-support.patch
rename to meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/vsftpd-tcp_wrappers-support.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb
rename to meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-devtools/perl/libauthen/libauthen-radius-perl/run-ptest b/meta-openembedded/meta-networking/recipes-devtools/perl/libauthen/libauthen-radius-perl/run-ptest
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-devtools/perl/libauthen/libauthen-radius-perl/run-ptest
rename to meta-openembedded/meta-networking/recipes-devtools/perl/libauthen/libauthen-radius-perl/run-ptest
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-devtools/perl/libauthen/libauthen-radius-perl/test.pl-adjust-for-ptest.patch b/meta-openembedded/meta-networking/recipes-devtools/perl/libauthen/libauthen-radius-perl/test.pl-adjust-for-ptest.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-devtools/perl/libauthen/libauthen-radius-perl/test.pl-adjust-for-ptest.patch
rename to meta-openembedded/meta-networking/recipes-devtools/perl/libauthen/libauthen-radius-perl/test.pl-adjust-for-ptest.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-devtools/perl/libauthen/libauthen-radius-perl_0.22.bb b/meta-openembedded/meta-networking/recipes-devtools/perl/libauthen/libauthen-radius-perl_0.22.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-devtools/perl/libauthen/libauthen-radius-perl_0.22.bb
rename to meta-openembedded/meta-networking/recipes-devtools/perl/libauthen/libauthen-radius-perl_0.22.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-devtools/python/python-ldap_2.4.41.bb b/meta-openembedded/meta-networking/recipes-devtools/python/python-ldap_2.4.41.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-devtools/python/python-ldap_2.4.41.bb
rename to meta-openembedded/meta-networking/recipes-devtools/python/python-ldap_2.4.41.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-extended/corosync/corosync_2.4.3.bb b/meta-openembedded/meta-networking/recipes-extended/corosync/corosync_2.4.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-extended/corosync/corosync_2.4.3.bb
rename to meta-openembedded/meta-networking/recipes-extended/corosync/corosync_2.4.3.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-extended/dlm/dlm/respect-ldflags-also-from-bin_ldflags.patch b/meta-openembedded/meta-networking/recipes-extended/dlm/dlm/respect-ldflags-also-from-bin_ldflags.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-extended/dlm/dlm/respect-ldflags-also-from-bin_ldflags.patch
rename to meta-openembedded/meta-networking/recipes-extended/dlm/dlm/respect-ldflags-also-from-bin_ldflags.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-extended/dlm/dlm_4.0.2.bb b/meta-openembedded/meta-networking/recipes-extended/dlm/dlm_4.0.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-extended/dlm/dlm_4.0.2.bb
rename to meta-openembedded/meta-networking/recipes-extended/dlm/dlm_4.0.2.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-extended/iscsitarget/files/0001-kernel-event-netlink_ack-now-requires-4-arguments.patch b/meta-openembedded/meta-networking/recipes-extended/iscsitarget/files/0001-kernel-event-netlink_ack-now-requires-4-arguments.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-extended/iscsitarget/files/0001-kernel-event-netlink_ack-now-requires-4-arguments.patch
rename to meta-openembedded/meta-networking/recipes-extended/iscsitarget/files/0001-kernel-event-netlink_ack-now-requires-4-arguments.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-extended/iscsitarget/files/access-sk_v6_daddr-iff-IPV6-defined.patch b/meta-openembedded/meta-networking/recipes-extended/iscsitarget/files/access-sk_v6_daddr-iff-IPV6-defined.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-extended/iscsitarget/files/access-sk_v6_daddr-iff-IPV6-defined.patch
rename to meta-openembedded/meta-networking/recipes-extended/iscsitarget/files/access-sk_v6_daddr-iff-IPV6-defined.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-extended/iscsitarget/files/build_with_updated_bio_struct_of_linux_v4.3_and_above.patch b/meta-openembedded/meta-networking/recipes-extended/iscsitarget/files/build_with_updated_bio_struct_of_linux_v4.3_and_above.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-extended/iscsitarget/files/build_with_updated_bio_struct_of_linux_v4.3_and_above.patch
rename to meta-openembedded/meta-networking/recipes-extended/iscsitarget/files/build_with_updated_bio_struct_of_linux_v4.3_and_above.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-extended/iscsitarget/files/build_with_updated_interfaces_of_linux_v4.8_and_above.patch b/meta-openembedded/meta-networking/recipes-extended/iscsitarget/files/build_with_updated_interfaces_of_linux_v4.8_and_above.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-extended/iscsitarget/files/build_with_updated_interfaces_of_linux_v4.8_and_above.patch
rename to meta-openembedded/meta-networking/recipes-extended/iscsitarget/files/build_with_updated_interfaces_of_linux_v4.8_and_above.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-extended/iscsitarget/files/fix-call-trace-of-ahash-API-calling.patch b/meta-openembedded/meta-networking/recipes-extended/iscsitarget/files/fix-call-trace-of-ahash-API-calling.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-extended/iscsitarget/files/fix-call-trace-of-ahash-API-calling.patch
rename to meta-openembedded/meta-networking/recipes-extended/iscsitarget/files/fix-call-trace-of-ahash-API-calling.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-extended/iscsitarget/files/fix-errors-observed-with-linux-3.19-and-greater.patch b/meta-openembedded/meta-networking/recipes-extended/iscsitarget/files/fix-errors-observed-with-linux-3.19-and-greater.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-extended/iscsitarget/files/fix-errors-observed-with-linux-3.19-and-greater.patch
rename to meta-openembedded/meta-networking/recipes-extended/iscsitarget/files/fix-errors-observed-with-linux-3.19-and-greater.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-extended/iscsitarget/files/use-kernel-makefile-to-get-kernel-version.patch b/meta-openembedded/meta-networking/recipes-extended/iscsitarget/files/use-kernel-makefile-to-get-kernel-version.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-extended/iscsitarget/files/use-kernel-makefile-to-get-kernel-version.patch
rename to meta-openembedded/meta-networking/recipes-extended/iscsitarget/files/use-kernel-makefile-to-get-kernel-version.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb b/meta-openembedded/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb
rename to meta-openembedded/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.0.1g.bb b/meta-openembedded/meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.0.1g.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.0.1g.bb
rename to meta-openembedded/meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.0.1g.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.4.bb b/meta-openembedded/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.4.bb
rename to meta-openembedded/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.4.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/conntrack-tools/files/conntrack-failover b/meta-openembedded/meta-networking/recipes-filter/conntrack-tools/files/conntrack-failover
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/conntrack-tools/files/conntrack-failover
rename to meta-openembedded/meta-networking/recipes-filter/conntrack-tools/files/conntrack-failover
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/conntrack-tools/files/init b/meta-openembedded/meta-networking/recipes-filter/conntrack-tools/files/init
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/conntrack-tools/files/init
rename to meta-openembedded/meta-networking/recipes-filter/conntrack-tools/files/init
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0001-add-RARP-and-update-iana-url.patch b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0001-add-RARP-and-update-iana-url.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0001-add-RARP-and-update-iana-url.patch
rename to meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0001-add-RARP-and-update-iana-url.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0002-fix-compilation-warning.patch b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0002-fix-compilation-warning.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0002-fix-compilation-warning.patch
rename to meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0002-fix-compilation-warning.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0003-add-info-about-Wl-no-as-needed.patch b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0003-add-info-about-Wl-no-as-needed.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0003-add-info-about-Wl-no-as-needed.patch
rename to meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0003-add-info-about-Wl-no-as-needed.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0004-workaround-for-kernel-regression-bug-IPv6-source-des.patch b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0004-workaround-for-kernel-regression-bug-IPv6-source-des.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0004-workaround-for-kernel-regression-bug-IPv6-source-des.patch
rename to meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0004-workaround-for-kernel-regression-bug-IPv6-source-des.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0005-Add-noflush-command-line-support-for-ebtables-restor.patch b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0005-Add-noflush-command-line-support-for-ebtables-restor.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0005-Add-noflush-command-line-support-for-ebtables-restor.patch
rename to meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0005-Add-noflush-command-line-support-for-ebtables-restor.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0006-don-t-print-IPv6-mask-if-it-s-all-ones-based-on-patc.patch b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0006-don-t-print-IPv6-mask-if-it-s-all-ones-based-on-patc.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0006-don-t-print-IPv6-mask-if-it-s-all-ones-based-on-patc.patch
rename to meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0006-don-t-print-IPv6-mask-if-it-s-all-ones-based-on-patc.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0007-extensions-Use-stdint-types.patch b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0007-extensions-Use-stdint-types.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0007-extensions-Use-stdint-types.patch
rename to meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0007-extensions-Use-stdint-types.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch
rename to meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch
rename to meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0010-Adjust-header-include-sequence.patch b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0010-Adjust-header-include-sequence.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0010-Adjust-header-include-sequence.patch
rename to meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0010-Adjust-header-include-sequence.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/01debian_defaultconfig.patch b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/01debian_defaultconfig.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/01debian_defaultconfig.patch
rename to meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/01debian_defaultconfig.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables-save b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables-save
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables-save
rename to meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables-save
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.common b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.common
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.common
rename to meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.common
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.init b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.init
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.init
rename to meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.init
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.service b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.service
rename to meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/installnonroot.patch b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/installnonroot.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/installnonroot.patch
rename to meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/installnonroot.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/no-as-needed.patch b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/no-as-needed.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/no-as-needed.patch
rename to meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/no-as-needed.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb
rename to meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/libnetfilter/files/0001-Correct-typo-in-the-location-of-internal.h-in-includ.patch b/meta-openembedded/meta-networking/recipes-filter/libnetfilter/files/0001-Correct-typo-in-the-location-of-internal.h-in-includ.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/libnetfilter/files/0001-Correct-typo-in-the-location-of-internal.h-in-includ.patch
rename to meta-openembedded/meta-networking/recipes-filter/libnetfilter/files/0001-Correct-typo-in-the-location-of-internal.h-in-includ.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/libnetfilter/files/0001-libnetfilter-acct-Declare-the-define-visivility-attribute-together.patch b/meta-openembedded/meta-networking/recipes-filter/libnetfilter/files/0001-libnetfilter-acct-Declare-the-define-visivility-attribute-together.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/libnetfilter/files/0001-libnetfilter-acct-Declare-the-define-visivility-attribute-together.patch
rename to meta-openembedded/meta-networking/recipes-filter/libnetfilter/files/0001-libnetfilter-acct-Declare-the-define-visivility-attribute-together.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/libnetfilter/files/0001-libnetfilter-queue-Declare-the-define-visivility-attribute-together.patch b/meta-openembedded/meta-networking/recipes-filter/libnetfilter/files/0001-libnetfilter-queue-Declare-the-define-visivility-attribute-together.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/libnetfilter/files/0001-libnetfilter-queue-Declare-the-define-visivility-attribute-together.patch
rename to meta-openembedded/meta-networking/recipes-filter/libnetfilter/files/0001-libnetfilter-queue-Declare-the-define-visivility-attribute-together.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/libnetfilter/files/libnetfilter-cthelper-visibility-hidden.patch b/meta-openembedded/meta-networking/recipes-filter/libnetfilter/files/libnetfilter-cthelper-visibility-hidden.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/libnetfilter/files/libnetfilter-cthelper-visibility-hidden.patch
rename to meta-openembedded/meta-networking/recipes-filter/libnetfilter/files/libnetfilter-cthelper-visibility-hidden.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/libnetfilter/files/libnetfilter-cttimeout-visibility-hidden.patch b/meta-openembedded/meta-networking/recipes-filter/libnetfilter/files/libnetfilter-cttimeout-visibility-hidden.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/libnetfilter/files/libnetfilter-cttimeout-visibility-hidden.patch
rename to meta-openembedded/meta-networking/recipes-filter/libnetfilter/files/libnetfilter-cttimeout-visibility-hidden.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-acct_1.0.3.bb b/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-acct_1.0.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-acct_1.0.3.bb
rename to meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-acct_1.0.3.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.0.6.bb b/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.0.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.0.6.bb
rename to meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.0.6.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-cthelper_1.0.0.bb b/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-cthelper_1.0.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-cthelper_1.0.0.bb
rename to meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-cthelper_1.0.0.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-cttimeout_1.0.0.bb b/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-cttimeout_1.0.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-cttimeout_1.0.0.bb
rename to meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-cttimeout_1.0.0.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-log_1.0.1.bb b/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-log_1.0.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-log_1.0.1.bb
rename to meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-log_1.0.1.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.2.bb b/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.2.bb
rename to meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.2.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0001-build-resolve-automake-1.12-warnings.patch b/meta-openembedded/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0001-build-resolve-automake-1.12-warnings.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0001-build-resolve-automake-1.12-warnings.patch
rename to meta-openembedded/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0001-build-resolve-automake-1.12-warnings.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0002-src-get-source-code-license-header-in-sync-with-curr.patch b/meta-openembedded/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0002-src-get-source-code-license-header-in-sync-with-curr.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0002-src-get-source-code-license-header-in-sync-with-curr.patch
rename to meta-openembedded/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0002-src-get-source-code-license-header-in-sync-with-curr.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0003-configure-uclinux-is-also-linux.patch b/meta-openembedded/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0003-configure-uclinux-is-also-linux.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0003-configure-uclinux-is-also-linux.patch
rename to meta-openembedded/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0003-configure-uclinux-is-also-linux.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch b/meta-openembedded/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch
rename to meta-openembedded/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0005-include-Sync-with-kernel-headers.patch b/meta-openembedded/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0005-include-Sync-with-kernel-headers.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0005-include-Sync-with-kernel-headers.patch
rename to meta-openembedded/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0005-include-Sync-with-kernel-headers.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0006-src-Use-stdint-types-everywhere.patch b/meta-openembedded/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0006-src-Use-stdint-types-everywhere.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0006-src-Use-stdint-types-everywhere.patch
rename to meta-openembedded/meta-networking/recipes-filter/libnfnetlink/libnfnetlink/0006-src-Use-stdint-types-everywhere.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb b/meta-openembedded/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb
rename to meta-openembedded/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl/0001-Declare-the-define-visivility-attribute-together.patch b/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl/0001-Declare-the-define-visivility-attribute-together.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl/0001-Declare-the-define-visivility-attribute-together.patch
rename to meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl/0001-Declare-the-define-visivility-attribute-together.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl/0001-avoid-naming-local-function-as-one-of-printf-family.patch b/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl/0001-avoid-naming-local-function-as-one-of-printf-family.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl/0001-avoid-naming-local-function-as-one-of-printf-family.patch
rename to meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl/0001-avoid-naming-local-function-as-one-of-printf-family.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.0.7.bb b/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.0.7.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.0.7.bb
rename to meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.0.7.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/nfacct/nfacct_1.0.2.bb b/meta-openembedded/meta-networking/recipes-filter/nfacct/nfacct_1.0.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/nfacct/nfacct_1.0.2.bb
rename to meta-openembedded/meta-networking/recipes-filter/nfacct/nfacct_1.0.2.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/nftables/files/0001-payload-explicit-network-ctx-assignment-for-icmp-icm.patch b/meta-openembedded/meta-networking/recipes-filter/nftables/files/0001-payload-explicit-network-ctx-assignment-for-icmp-icm.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/nftables/files/0001-payload-explicit-network-ctx-assignment-for-icmp-icm.patch
rename to meta-openembedded/meta-networking/recipes-filter/nftables/files/0001-payload-explicit-network-ctx-assignment-for-icmp-icm.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/nftables/files/0002-proto-Add-some-exotic-ICMPv6-types.patch b/meta-openembedded/meta-networking/recipes-filter/nftables/files/0002-proto-Add-some-exotic-ICMPv6-types.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/nftables/files/0002-proto-Add-some-exotic-ICMPv6-types.patch
rename to meta-openembedded/meta-networking/recipes-filter/nftables/files/0002-proto-Add-some-exotic-ICMPv6-types.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/nftables/files/0003-payload-split-ll-proto-dependency-into-helper.patch b/meta-openembedded/meta-networking/recipes-filter/nftables/files/0003-payload-split-ll-proto-dependency-into-helper.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/nftables/files/0003-payload-split-ll-proto-dependency-into-helper.patch
rename to meta-openembedded/meta-networking/recipes-filter/nftables/files/0003-payload-split-ll-proto-dependency-into-helper.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/nftables/files/0004-src-allow-update-of-net-base-w.-meta-l4proto-icmpv6.patch b/meta-openembedded/meta-networking/recipes-filter/nftables/files/0004-src-allow-update-of-net-base-w.-meta-l4proto-icmpv6.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/nftables/files/0004-src-allow-update-of-net-base-w.-meta-l4proto-icmpv6.patch
rename to meta-openembedded/meta-networking/recipes-filter/nftables/files/0004-src-allow-update-of-net-base-w.-meta-l4proto-icmpv6.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/nftables/files/0005-src-ipv6-switch-implicit-dependencies-to-meta-l4prot.patch b/meta-openembedded/meta-networking/recipes-filter/nftables/files/0005-src-ipv6-switch-implicit-dependencies-to-meta-l4prot.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/nftables/files/0005-src-ipv6-switch-implicit-dependencies-to-meta-l4prot.patch
rename to meta-openembedded/meta-networking/recipes-filter/nftables/files/0005-src-ipv6-switch-implicit-dependencies-to-meta-l4prot.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/nftables/files/0006-payload-enforce-ip-ip6-protocol-depending-on-icmp-or.patch b/meta-openembedded/meta-networking/recipes-filter/nftables/files/0006-payload-enforce-ip-ip6-protocol-depending-on-icmp-or.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/nftables/files/0006-payload-enforce-ip-ip6-protocol-depending-on-icmp-or.patch
rename to meta-openembedded/meta-networking/recipes-filter/nftables/files/0006-payload-enforce-ip-ip6-protocol-depending-on-icmp-or.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/nftables/files/0007-src-ip-switch-implicit-dependencies-to-meta-l4proto-.patch b/meta-openembedded/meta-networking/recipes-filter/nftables/files/0007-src-ip-switch-implicit-dependencies-to-meta-l4proto-.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/nftables/files/0007-src-ip-switch-implicit-dependencies-to-meta-l4proto-.patch
rename to meta-openembedded/meta-networking/recipes-filter/nftables/files/0007-src-ip-switch-implicit-dependencies-to-meta-l4proto-.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/nftables/files/fix-to-generate-ntf.8.patch b/meta-openembedded/meta-networking/recipes-filter/nftables/files/fix-to-generate-ntf.8.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/nftables/files/fix-to-generate-ntf.8.patch
rename to meta-openembedded/meta-networking/recipes-filter/nftables/files/fix-to-generate-ntf.8.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.7.bb b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.7.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.7.bb
rename to meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.7.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-irc/znc/znc_git.bb b/meta-openembedded/meta-networking/recipes-irc/znc/znc_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-irc/znc/znc_git.bb
rename to meta-openembedded/meta-networking/recipes-irc/znc/znc_git.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20171221.bb b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20171221.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20171221.bb
rename to meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_0.0.20171221.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20171221.bb b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20171221.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20171221.bb
rename to meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_0.0.20171221.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard.inc b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard.inc
rename to meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard.inc
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp/0001-ftp-include-sys-types.h-for-u_long.patch b/meta-openembedded/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp/0001-ftp-include-sys-types.h-for-u_long.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp/0001-ftp-include-sys-types.h-for-u_long.patch
rename to meta-openembedded/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp/0001-ftp-include-sys-types.h-for-u_long.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp/Add_ARG_MAX_define.patch b/meta-openembedded/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp/Add_ARG_MAX_define.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp/Add_ARG_MAX_define.patch
rename to meta-openembedded/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp/Add_ARG_MAX_define.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb b/meta-openembedded/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb
rename to meta-openembedded/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc/0001-rpcgen-Fix-printf-formats.patch b/meta-openembedded/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc/0001-rpcgen-Fix-printf-formats.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc/0001-rpcgen-Fix-printf-formats.patch
rename to meta-openembedded/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc/0001-rpcgen-Fix-printf-formats.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc/gcc4.patch b/meta-openembedded/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc/gcc4.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc/gcc4.patch
rename to meta-openembedded/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc/gcc4.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc_0.17.bb b/meta-openembedded/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc_0.17.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc_0.17.bb
rename to meta-openembedded/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc_0.17.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/fix-host-variable.patch b/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/fix-host-variable.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/fix-host-variable.patch
rename to meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/fix-host-variable.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/fixup_wait3_api_change.patch b/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/fixup_wait3_api_change.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/fixup_wait3_api_change.patch
rename to meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/fixup_wait3_api_change.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/netkit-rsh-0.17-rexec-ipv6.patch b/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/netkit-rsh-0.17-rexec-ipv6.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/netkit-rsh-0.17-rexec-ipv6.patch
rename to meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/netkit-rsh-0.17-rexec-ipv6.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/no_pam_build_fix.patch b/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/no_pam_build_fix.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/no_pam_build_fix.patch
rename to meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/no_pam_build_fix.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rexec.pam b/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rexec.pam
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rexec.pam
rename to meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rexec.pam
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rexec.xinetd.netkit b/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rexec.xinetd.netkit
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rexec.xinetd.netkit
rename to meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rexec.xinetd.netkit
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rlogin.pam b/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rlogin.pam
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rlogin.pam
rename to meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rlogin.pam
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rlogin.xinetd.netkit b/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rlogin.xinetd.netkit
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rlogin.xinetd.netkit
rename to meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rlogin.xinetd.netkit
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rsh-redone_link_order_file.patch b/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rsh-redone_link_order_file.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rsh-redone_link_order_file.patch
rename to meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rsh-redone_link_order_file.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rsh.pam b/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rsh.pam
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rsh.pam
rename to meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rsh.pam
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rsh.xinetd.netkit b/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rsh.xinetd.netkit
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rsh.xinetd.netkit
rename to meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh/rsh.xinetd.netkit
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb b/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb
rename to meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers/rpc.rusersd-Makefile-fix-parallel-build-issue.patch b/meta-openembedded/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers/rpc.rusersd-Makefile-fix-parallel-build-issue.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers/rpc.rusersd-Makefile-fix-parallel-build-issue.patch
rename to meta-openembedded/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers/rpc.rusersd-Makefile-fix-parallel-build-issue.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers_0.17.bb b/meta-openembedded/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers_0.17.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers_0.17.bb
rename to meta-openembedded/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers_0.17.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0001-Add-missing-include-path-to-I-options.patch b/meta-openembedded/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0001-Add-missing-include-path-to-I-options.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0001-Add-missing-include-path-to-I-options.patch
rename to meta-openembedded/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0001-Add-missing-include-path-to-I-options.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0002-Fix-build-issues-found-with-musl.patch b/meta-openembedded/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0002-Fix-build-issues-found-with-musl.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0002-Fix-build-issues-found-with-musl.patch
rename to meta-openembedded/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0002-Fix-build-issues-found-with-musl.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/rwhod b/meta-openembedded/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/rwhod
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/rwhod
rename to meta-openembedded/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/rwhod
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/rwhod.default b/meta-openembedded/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/rwhod.default
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/rwhod.default
rename to meta-openembedded/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/rwhod.default
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb b/meta-openembedded/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb
rename to meta-openembedded/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/files/0001-telnet-telnetd-Fix-print-format-strings.patch b/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/files/0001-telnet-telnetd-Fix-print-format-strings.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/files/0001-telnet-telnetd-Fix-print-format-strings.patch
rename to meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/files/0001-telnet-telnetd-Fix-print-format-strings.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/files/To-aviod-buffer-overflow-in-telnet.patch b/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/files/To-aviod-buffer-overflow-in-telnet.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/files/To-aviod-buffer-overflow-in-telnet.patch
rename to meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/files/To-aviod-buffer-overflow-in-telnet.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/files/Warning-fix-in-the-step-of-install.patch b/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/files/Warning-fix-in-the-step-of-install.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/files/Warning-fix-in-the-step-of-install.patch
rename to meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/files/Warning-fix-in-the-step-of-install.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/files/cross-compile.patch b/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/files/cross-compile.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/files/cross-compile.patch
rename to meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/files/cross-compile.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/files/telnet-xinetd b/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/files/telnet-xinetd
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/files/telnet-xinetd
rename to meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/files/telnet-xinetd
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/netkit-telnet_0.17.bb b/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/netkit-telnet_0.17.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/netkit-telnet_0.17.bb
rename to meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/netkit-telnet_0.17.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-tftp/netkit-tftp/0001-tftp-Include-missing-fcntl.h.patch b/meta-openembedded/meta-networking/recipes-netkit/netkit-tftp/netkit-tftp/0001-tftp-Include-missing-fcntl.h.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-tftp/netkit-tftp/0001-tftp-Include-missing-fcntl.h.patch
rename to meta-openembedded/meta-networking/recipes-netkit/netkit-tftp/netkit-tftp/0001-tftp-Include-missing-fcntl.h.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-tftp/netkit-tftp/tftp.conf b/meta-openembedded/meta-networking/recipes-netkit/netkit-tftp/netkit-tftp/tftp.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-tftp/netkit-tftp/tftp.conf
rename to meta-openembedded/meta-networking/recipes-netkit/netkit-tftp/netkit-tftp/tftp.conf
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-tftp/netkit-tftp_0.17.bb b/meta-openembedded/meta-networking/recipes-netkit/netkit-tftp/netkit-tftp_0.17.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-tftp/netkit-tftp_0.17.bb
rename to meta-openembedded/meta-networking/recipes-netkit/netkit-tftp/netkit-tftp_0.17.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/dante/dante_1.4.1.bb b/meta-openembedded/meta-networking/recipes-protocols/dante/dante_1.4.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/dante/dante_1.4.1.bb
rename to meta-openembedded/meta-networking/recipes-protocols/dante/dante_1.4.1.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/freediameter/files/Replace-murmurhash-algorithm-with-Robert-Jenkin-s-ha.patch b/meta-openembedded/meta-networking/recipes-protocols/freediameter/files/Replace-murmurhash-algorithm-with-Robert-Jenkin-s-ha.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/freediameter/files/Replace-murmurhash-algorithm-with-Robert-Jenkin-s-ha.patch
rename to meta-openembedded/meta-networking/recipes-protocols/freediameter/files/Replace-murmurhash-algorithm-with-Robert-Jenkin-s-ha.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/freediameter/files/freeDiameter.conf b/meta-openembedded/meta-networking/recipes-protocols/freediameter/files/freeDiameter.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/freediameter/files/freeDiameter.conf
rename to meta-openembedded/meta-networking/recipes-protocols/freediameter/files/freeDiameter.conf
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/freediameter/files/freediameter.init b/meta-openembedded/meta-networking/recipes-protocols/freediameter/files/freediameter.init
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/freediameter/files/freediameter.init
rename to meta-openembedded/meta-networking/recipes-protocols/freediameter/files/freediameter.init
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/freediameter/files/freediameter.service b/meta-openembedded/meta-networking/recipes-protocols/freediameter/files/freediameter.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/freediameter/files/freediameter.service
rename to meta-openembedded/meta-networking/recipes-protocols/freediameter/files/freediameter.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/freediameter/files/install_test.patch b/meta-openembedded/meta-networking/recipes-protocols/freediameter/files/install_test.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/freediameter/files/install_test.patch
rename to meta-openembedded/meta-networking/recipes-protocols/freediameter/files/install_test.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/freediameter/files/pass-ptest-env.patch b/meta-openembedded/meta-networking/recipes-protocols/freediameter/files/pass-ptest-env.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/freediameter/files/pass-ptest-env.patch
rename to meta-openembedded/meta-networking/recipes-protocols/freediameter/files/pass-ptest-env.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/freediameter/files/run-ptest b/meta-openembedded/meta-networking/recipes-protocols/freediameter/files/run-ptest
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/freediameter/files/run-ptest
rename to meta-openembedded/meta-networking/recipes-protocols/freediameter/files/run-ptest
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/freediameter/freediameter_1.2.1.bb b/meta-openembedded/meta-networking/recipes-protocols/freediameter/freediameter_1.2.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/freediameter/freediameter_1.2.1.bb
rename to meta-openembedded/meta-networking/recipes-protocols/freediameter/freediameter_1.2.1.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/mdns/files/0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch b/meta-openembedded/meta-networking/recipes-protocols/mdns/files/0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/mdns/files/0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch
rename to meta-openembedded/meta-networking/recipes-protocols/mdns/files/0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/mdns/files/build.patch b/meta-openembedded/meta-networking/recipes-protocols/mdns/files/build.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/mdns/files/build.patch
rename to meta-openembedded/meta-networking/recipes-protocols/mdns/files/build.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/mdns/files/mdns.service b/meta-openembedded/meta-networking/recipes-protocols/mdns/files/mdns.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/mdns/files/mdns.service
rename to meta-openembedded/meta-networking/recipes-protocols/mdns/files/mdns.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_765.50.9.bb b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_765.50.9.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_765.50.9.bb
rename to meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_765.50.9.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/files/init b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/files/init
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/files/init
rename to meta-openembedded/meta-networking/recipes-protocols/net-snmp/files/init
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/files/snmpd.conf b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/files/snmpd.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/files/snmpd.conf
rename to meta-openembedded/meta-networking/recipes-protocols/net-snmp/files/snmpd.conf
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/files/snmptrapd.conf b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/files/snmptrapd.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/files/snmptrapd.conf
rename to meta-openembedded/meta-networking/recipes-protocols/net-snmp/files/snmptrapd.conf
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-BUG-a2584-Fix-snmptrap-to-use-clientaddr-from-snmp.c.patch b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-BUG-a2584-Fix-snmptrap-to-use-clientaddr-from-snmp.c.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-BUG-a2584-Fix-snmptrap-to-use-clientaddr-from-snmp.c.patch
rename to meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-BUG-a2584-Fix-snmptrap-to-use-clientaddr-from-snmp.c.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Remove-U64-typedef.patch b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Remove-U64-typedef.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Remove-U64-typedef.patch
rename to meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-Remove-U64-typedef.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch
rename to meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_headers-Error-Fix.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_libs2-Error-Fix.patch b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_libs2-Error-Fix.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_libs2-Error-Fix.patch
rename to meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-config_os_libs2-Error-Fix.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-configure-fix-check-for-enable-perl-cc-checks.patch b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-configure-fix-check-for-enable-perl-cc-checks.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-configure-fix-check-for-enable-perl-cc-checks.patch
rename to meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-configure-fix-check-for-enable-perl-cc-checks.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-get_pid_from_inode-Include-limit.h.patch b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-get_pid_from_inode-Include-limit.h.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-get_pid_from_inode-Include-limit.h.patch
rename to meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-get_pid_from_inode-Include-limit.h.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-UDPIPv6-transport-Add-a-missing-return-state.patch b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-UDPIPv6-transport-Add-a-missing-return-state.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-UDPIPv6-transport-Add-a-missing-return-state.patch
rename to meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-UDPIPv6-transport-Add-a-missing-return-state.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch
rename to meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0002-configure-fix-a-cc-check-issue.patch b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0002-configure-fix-a-cc-check-issue.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0002-configure-fix-a-cc-check-issue.patch
rename to meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0002-configure-fix-a-cc-check-issue.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0003-CHANGES-BUG-2712-Fix-Perl-module-compilation.patch b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0003-CHANGES-BUG-2712-Fix-Perl-module-compilation.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0003-CHANGES-BUG-2712-Fix-Perl-module-compilation.patch
rename to meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0003-CHANGES-BUG-2712-Fix-Perl-module-compilation.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0004-configure-fix-incorrect-variable.patch b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0004-configure-fix-incorrect-variable.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0004-configure-fix-incorrect-variable.patch
rename to meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0004-configure-fix-incorrect-variable.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/dont-return-incompletely-parsed-varbinds.patch b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/dont-return-incompletely-parsed-varbinds.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/dont-return-incompletely-parsed-varbinds.patch
rename to meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/dont-return-incompletely-parsed-varbinds.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-libtool-finish.patch b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-libtool-finish.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-libtool-finish.patch
rename to meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-libtool-finish.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch
rename to meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-add-knob-whether-nlist.h-are-checked.patch b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-add-knob-whether-nlist.h-are-checked.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-add-knob-whether-nlist.h-are-checked.patch
rename to meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-add-knob-whether-nlist.h-are-checked.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-agentx-crash.patch b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-agentx-crash.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-agentx-crash.patch
rename to meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-agentx-crash.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch
rename to meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-fix-for-disable-des.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-testing-add-the-output-format-for-ptest.patch b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-testing-add-the-output-format-for-ptest.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-testing-add-the-output-format-for-ptest.patch
rename to meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-testing-add-the-output-format-for-ptest.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/run-ptest b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/run-ptest
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/run-ptest
rename to meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/run-ptest
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/snmpd.service b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/snmpd.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/snmpd.service
rename to meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/snmpd.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/snmptrapd.service b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/snmptrapd.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/snmptrapd.service
rename to meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/snmptrapd.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/systemd-support.patch b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/systemd-support.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/systemd-support.patch
rename to meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/systemd-support.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb
rename to meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/nopoll/nopoll_0.4.2.b297.bb b/meta-openembedded/meta-networking/recipes-protocols/nopoll/nopoll_0.4.2.b297.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/nopoll/nopoll_0.4.2.b297.bb
rename to meta-openembedded/meta-networking/recipes-protocols/nopoll/nopoll_0.4.2.b297.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow.inc b/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow.inc
rename to meta-openembedded/meta-networking/recipes-protocols/openflow/openflow.inc
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow/0001-Check-and-use-strlcpy-from-libc-before-defining-own.patch b/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow/0001-Check-and-use-strlcpy-from-libc-before-defining-own.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow/0001-Check-and-use-strlcpy-from-libc-before-defining-own.patch
rename to meta-openembedded/meta-networking/recipes-protocols/openflow/openflow/0001-Check-and-use-strlcpy-from-libc-before-defining-own.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow/0002-lib-netdev-Adjust-header-include-sequence.patch b/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow/0002-lib-netdev-Adjust-header-include-sequence.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow/0002-lib-netdev-Adjust-header-include-sequence.patch
rename to meta-openembedded/meta-networking/recipes-protocols/openflow/openflow/0002-lib-netdev-Adjust-header-include-sequence.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow_1.0.bb b/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow_1.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow_1.0.bb
rename to meta-openembedded/meta-networking/recipes-protocols/openflow/openflow_1.0.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow_git.bb b/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow_git.bb
rename to meta-openembedded/meta-networking/recipes-protocols/openflow/openflow_git.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-Use-1-instead-of-WAIT_ANY.patch b/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-Use-1-instead-of-WAIT_ANY.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-Use-1-instead-of-WAIT_ANY.patch
rename to meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-Use-1-instead-of-WAIT_ANY.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api-Included-needed-headers.patch b/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api-Included-needed-headers.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api-Included-needed-headers.patch
rename to meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api-Included-needed-headers.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api.c-include-rpc-clnt.h-for-resultproc_t.patch b/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api.c-include-rpc-clnt.h-for-resultproc_t.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api.c-include-rpc-clnt.h-for-resultproc_t.patch
rename to meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api.c-include-rpc-clnt.h-for-resultproc_t.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-test-pppd_dummy.c-Fix-return-value.patch b/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-test-pppd_dummy.c-Fix-return-value.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-test-pppd_dummy.c-Fix-return-value.patch
rename to meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-test-pppd_dummy.c-Fix-return-value.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-cli-include-fcntl.h-for-O_CREAT-define.patch b/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-cli-include-fcntl.h-for-O_CREAT-define.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-cli-include-fcntl.h-for-O_CREAT-define.patch
rename to meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-cli-include-fcntl.h-for-O_CREAT-define.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-user-ipv6-structures.patch b/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-user-ipv6-structures.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-user-ipv6-structures.patch
rename to meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-user-ipv6-structures.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/0003-cli-Define-_GNU_SOURCE-for-getting-sighandler_t.patch b/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/0003-cli-Define-_GNU_SOURCE-for-getting-sighandler_t.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/0003-cli-Define-_GNU_SOURCE-for-getting-sighandler_t.patch
rename to meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/0003-cli-Define-_GNU_SOURCE-for-getting-sighandler_t.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch b/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch
rename to meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/Makefile-modify-CFLAGS-to-aviod-build-error.patch b/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/Makefile-modify-CFLAGS-to-aviod-build-error.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/Makefile-modify-CFLAGS-to-aviod-build-error.patch
rename to meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/Makefile-modify-CFLAGS-to-aviod-build-error.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/Makefile-obey-LDFLAGS.patch b/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/Makefile-obey-LDFLAGS.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/Makefile-obey-LDFLAGS.patch
rename to meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/Makefile-obey-LDFLAGS.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/fix_linux_4.15_compile.patch b/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/fix_linux_4.15_compile.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/fix_linux_4.15_compile.patch
rename to meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/fix_linux_4.15_compile.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tp-simplify-gcc-warning-hack.patch b/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tp-simplify-gcc-warning-hack.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tp-simplify-gcc-warning-hack.patch
rename to meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tp-simplify-gcc-warning-hack.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-enable-tests.patch b/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-enable-tests.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-enable-tests.patch
rename to meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-enable-tests.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix-sysconfig.patch b/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix-sysconfig.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix-sysconfig.patch
rename to meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix-sysconfig.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix-warning.patch b/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix-warning.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix-warning.patch
rename to meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix-warning.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix.patch b/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix.patch
rename to meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd-initscript-fix.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd.service b/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd.service
rename to meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/openl2tpd.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/run-ptest b/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/run-ptest
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/run-ptest
rename to meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/run-ptest
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb b/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb
rename to meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/pptp-linux/pptp-linux/0001-include-missing-sys-types.h.patch b/meta-openembedded/meta-networking/recipes-protocols/pptp-linux/pptp-linux/0001-include-missing-sys-types.h.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/pptp-linux/pptp-linux/0001-include-missing-sys-types.h.patch
rename to meta-openembedded/meta-networking/recipes-protocols/pptp-linux/pptp-linux/0001-include-missing-sys-types.h.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/pptp-linux/pptp-linux/options.pptp b/meta-openembedded/meta-networking/recipes-protocols/pptp-linux/pptp-linux/options.pptp
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/pptp-linux/pptp-linux/options.pptp
rename to meta-openembedded/meta-networking/recipes-protocols/pptp-linux/pptp-linux/options.pptp
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.9.0.bb b/meta-openembedded/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.9.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.9.0.bb
rename to meta-openembedded/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.9.0.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/files/bgpd.service b/meta-openembedded/meta-networking/recipes-protocols/quagga/files/bgpd.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/files/bgpd.service
rename to meta-openembedded/meta-networking/recipes-protocols/quagga/files/bgpd.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/files/isisd.service b/meta-openembedded/meta-networking/recipes-protocols/quagga/files/isisd.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/files/isisd.service
rename to meta-openembedded/meta-networking/recipes-protocols/quagga/files/isisd.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ospf6d.service b/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ospf6d.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ospf6d.service
rename to meta-openembedded/meta-networking/recipes-protocols/quagga/files/ospf6d.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ospfd.service b/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ospfd.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ospfd.service
rename to meta-openembedded/meta-networking/recipes-protocols/quagga/files/ospfd.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/files/quagga.default b/meta-openembedded/meta-networking/recipes-protocols/quagga/files/quagga.default
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/files/quagga.default
rename to meta-openembedded/meta-networking/recipes-protocols/quagga/files/quagga.default
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/files/quagga.init b/meta-openembedded/meta-networking/recipes-protocols/quagga/files/quagga.init
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/files/quagga.init
rename to meta-openembedded/meta-networking/recipes-protocols/quagga/files/quagga.init
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/files/quagga.pam b/meta-openembedded/meta-networking/recipes-protocols/quagga/files/quagga.pam
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/files/quagga.pam
rename to meta-openembedded/meta-networking/recipes-protocols/quagga/files/quagga.pam
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ripd.service b/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ripd.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ripd.service
rename to meta-openembedded/meta-networking/recipes-protocols/quagga/files/ripd.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ripngd.service b/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ripngd.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/files/ripngd.service
rename to meta-openembedded/meta-networking/recipes-protocols/quagga/files/ripngd.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/files/volatiles.03_quagga b/meta-openembedded/meta-networking/recipes-protocols/quagga/files/volatiles.03_quagga
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/files/volatiles.03_quagga
rename to meta-openembedded/meta-networking/recipes-protocols/quagga/files/volatiles.03_quagga
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/files/watchquagga.default b/meta-openembedded/meta-networking/recipes-protocols/quagga/files/watchquagga.default
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/files/watchquagga.default
rename to meta-openembedded/meta-networking/recipes-protocols/quagga/files/watchquagga.default
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/files/watchquagga.init b/meta-openembedded/meta-networking/recipes-protocols/quagga/files/watchquagga.init
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/files/watchquagga.init
rename to meta-openembedded/meta-networking/recipes-protocols/quagga/files/watchquagga.init
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/files/zebra.service b/meta-openembedded/meta-networking/recipes-protocols/quagga/files/zebra.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/files/zebra.service
rename to meta-openembedded/meta-networking/recipes-protocols/quagga/files/zebra.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga.inc b/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga.inc
rename to meta-openembedded/meta-networking/recipes-protocols/quagga/quagga.inc
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga_1.2.4.bb b/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga_1.2.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga_1.2.4.bb
rename to meta-openembedded/meta-networking/recipes-protocols/quagga/quagga_1.2.4.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng/Modify-configure.in-and-etc-Makefile.am.patch b/meta-openembedded/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng/Modify-configure.in-and-etc-Makefile.am.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng/Modify-configure.in-and-etc-Makefile.am.patch
rename to meta-openembedded/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng/Modify-configure.in-and-etc-Makefile.am.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng/config-site.radiusclient-ng-0.5.6 b/meta-openembedded/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng/config-site.radiusclient-ng-0.5.6
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng/config-site.radiusclient-ng-0.5.6
rename to meta-openembedded/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng/config-site.radiusclient-ng-0.5.6
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng_0.5.6.bb b/meta-openembedded/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng_0.5.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng_0.5.6.bb
rename to meta-openembedded/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng_0.5.6.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0001-ppoe-Dont-include-linux-if_ether.h.patch b/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0001-ppoe-Dont-include-linux-if_ether.h.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0001-ppoe-Dont-include-linux-if_ether.h.patch
rename to meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0001-ppoe-Dont-include-linux-if_ether.h.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0002-Enable-support-for-the-kernel-module.patch b/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0002-Enable-support-for-the-kernel-module.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0002-Enable-support-for-the-kernel-module.patch
rename to meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/0002-Enable-support-for-the-kernel-module.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure.in-Error-fix.patch b/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure.in-Error-fix.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure.in-Error-fix.patch
rename to meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure.in-Error-fix.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure.patch b/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure.patch
rename to meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure_in_cross.patch b/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure_in_cross.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure_in_cross.patch
rename to meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure_in_cross.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/discard-use-of-dnl-in-Makefile.am.patch b/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/discard-use-of-dnl-in-Makefile.am.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/discard-use-of-dnl-in-Makefile.am.patch
rename to meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/discard-use-of-dnl-in-Makefile.am.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/dont-swallow-errors.patch b/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/dont-swallow-errors.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/dont-swallow-errors.patch
rename to meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/dont-swallow-errors.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-server.default b/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-server.default
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-server.default
rename to meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-server.default
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-server.init b/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-server.init
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-server.init
rename to meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-server.init
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-server.service b/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-server.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-server.service
rename to meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-server.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-src-restrictions.patch b/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-src-restrictions.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-src-restrictions.patch
rename to meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-src-restrictions.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/top-autoconf.patch b/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/top-autoconf.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/top-autoconf.patch
rename to meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/top-autoconf.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/update-config.patch b/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/update-config.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/update-config.patch
rename to meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/update-config.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb b/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb
rename to meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/tsocks/tsocks/makefile-add-ldflags.patch b/meta-openembedded/meta-networking/recipes-protocols/tsocks/tsocks/makefile-add-ldflags.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/tsocks/tsocks/makefile-add-ldflags.patch
rename to meta-openembedded/meta-networking/recipes-protocols/tsocks/tsocks/makefile-add-ldflags.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/tsocks/tsocks_1.8beta5.bb b/meta-openembedded/meta-networking/recipes-protocols/tsocks/tsocks_1.8beta5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/tsocks/tsocks_1.8beta5.bb
rename to meta-openembedded/meta-networking/recipes-protocols/tsocks/tsocks_1.8beta5.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/usrsctp/usrsctp/0001-Use-foreign-switch-for-automake.patch b/meta-openembedded/meta-networking/recipes-protocols/usrsctp/usrsctp/0001-Use-foreign-switch-for-automake.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/usrsctp/usrsctp/0001-Use-foreign-switch-for-automake.patch
rename to meta-openembedded/meta-networking/recipes-protocols/usrsctp/usrsctp/0001-Use-foreign-switch-for-automake.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/usrsctp/usrsctp_git.bb b/meta-openembedded/meta-networking/recipes-protocols/usrsctp/usrsctp_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/usrsctp/usrsctp_git.bb
rename to meta-openembedded/meta-networking/recipes-protocols/usrsctp/usrsctp_git.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd.inc b/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd.inc
rename to meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd.inc
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.6.bb b/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.6.bb
rename to meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.6.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_git.bb b/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_git.bb
rename to meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_git.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/zeroconf/zeroconf/0001-zeroconf-Rename-arp_op-to-avoid-namespace-conflicts-.patch b/meta-openembedded/meta-networking/recipes-protocols/zeroconf/zeroconf/0001-zeroconf-Rename-arp_op-to-avoid-namespace-conflicts-.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/zeroconf/zeroconf/0001-zeroconf-Rename-arp_op-to-avoid-namespace-conflicts-.patch
rename to meta-openembedded/meta-networking/recipes-protocols/zeroconf/zeroconf/0001-zeroconf-Rename-arp_op-to-avoid-namespace-conflicts-.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/zeroconf/zeroconf/compilefix.patch b/meta-openembedded/meta-networking/recipes-protocols/zeroconf/zeroconf/compilefix.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/zeroconf/zeroconf/compilefix.patch
rename to meta-openembedded/meta-networking/recipes-protocols/zeroconf/zeroconf/compilefix.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/zeroconf/zeroconf/debian-zeroconf b/meta-openembedded/meta-networking/recipes-protocols/zeroconf/zeroconf/debian-zeroconf
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/zeroconf/zeroconf/debian-zeroconf
rename to meta-openembedded/meta-networking/recipes-protocols/zeroconf/zeroconf/debian-zeroconf
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/zeroconf/zeroconf/makefile-add-ldflags.patch b/meta-openembedded/meta-networking/recipes-protocols/zeroconf/zeroconf/makefile-add-ldflags.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/zeroconf/zeroconf/makefile-add-ldflags.patch
rename to meta-openembedded/meta-networking/recipes-protocols/zeroconf/zeroconf/makefile-add-ldflags.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/zeroconf/zeroconf/zeroconf-default b/meta-openembedded/meta-networking/recipes-protocols/zeroconf/zeroconf/zeroconf-default
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/zeroconf/zeroconf/zeroconf-default
rename to meta-openembedded/meta-networking/recipes-protocols/zeroconf/zeroconf/zeroconf-default
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb b/meta-openembedded/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb
rename to meta-openembedded/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/aoetools/aoetools/aoe-stat-no-bashism.patch b/meta-openembedded/meta-networking/recipes-support/aoetools/aoetools/aoe-stat-no-bashism.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/aoetools/aoetools/aoe-stat-no-bashism.patch
rename to meta-openembedded/meta-networking/recipes-support/aoetools/aoetools/aoe-stat-no-bashism.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/aoetools/aoetools/makefile-add-ldflags.patch b/meta-openembedded/meta-networking/recipes-support/aoetools/aoetools/makefile-add-ldflags.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/aoetools/aoetools/makefile-add-ldflags.patch
rename to meta-openembedded/meta-networking/recipes-support/aoetools/aoetools/makefile-add-ldflags.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/aoetools/aoetools_36.bb b/meta-openembedded/meta-networking/recipes-support/aoetools/aoetools_36.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/aoetools/aoetools_36.bb
rename to meta-openembedded/meta-networking/recipes-support/aoetools/aoetools_36.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch b/meta-openembedded/meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch
rename to meta-openembedded/meta-networking/recipes-support/arptables/arptables/0001-Use-ARPCFLAGS-for-package-specific-compiler-flags.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/arptables/arptables/arptables-arpt-get-target-fix.patch b/meta-openembedded/meta-networking/recipes-support/arptables/arptables/arptables-arpt-get-target-fix.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/arptables/arptables/arptables-arpt-get-target-fix.patch
rename to meta-openembedded/meta-networking/recipes-support/arptables/arptables/arptables-arpt-get-target-fix.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/arptables/arptables/arptables-init-busybox.patch b/meta-openembedded/meta-networking/recipes-support/arptables/arptables/arptables-init-busybox.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/arptables/arptables/arptables-init-busybox.patch
rename to meta-openembedded/meta-networking/recipes-support/arptables/arptables/arptables-init-busybox.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/arptables/arptables/arptables-remove-bashism.patch b/meta-openembedded/meta-networking/recipes-support/arptables/arptables/arptables-remove-bashism.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/arptables/arptables/arptables-remove-bashism.patch
rename to meta-openembedded/meta-networking/recipes-support/arptables/arptables/arptables-remove-bashism.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/arptables/arptables/arptables.service b/meta-openembedded/meta-networking/recipes-support/arptables/arptables/arptables.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/arptables/arptables/arptables.service
rename to meta-openembedded/meta-networking/recipes-support/arptables/arptables/arptables.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/arptables/arptables_git.bb b/meta-openembedded/meta-networking/recipes-support/arptables/arptables_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/arptables/arptables_git.bb
rename to meta-openembedded/meta-networking/recipes-support/arptables/arptables_git.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0005-build-don-t-ignore-CFLAGS-from-environment.patch b/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0005-build-don-t-ignore-CFLAGS-from-environment.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0005-build-don-t-ignore-CFLAGS-from-environment.patch
rename to meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0005-build-don-t-ignore-CFLAGS-from-environment.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0006-libbridge-Modifying-the-AR-to-cross-toolchain.patch b/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0006-libbridge-Modifying-the-AR-to-cross-toolchain.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0006-libbridge-Modifying-the-AR-to-cross-toolchain.patch
rename to meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0006-libbridge-Modifying-the-AR-to-cross-toolchain.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/kernel-headers.patch b/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/kernel-headers.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/kernel-headers.patch
rename to meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/kernel-headers.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils_1.6.bb b/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils_1.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils_1.6.bb
rename to meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils_1.6.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch b/meta-openembedded/meta-networking/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch
rename to meta-openembedded/meta-networking/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/c-ares/c-ares_1.13.0.bb b/meta-openembedded/meta-networking/recipes-support/c-ares/c-ares_1.13.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/c-ares/c-ares_1.13.0.bb
rename to meta-openembedded/meta-networking/recipes-support/c-ares/c-ares_1.13.0.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch b/meta-openembedded/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch
rename to meta-openembedded/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/chrony/chrony/chrony.conf b/meta-openembedded/meta-networking/recipes-support/chrony/chrony/chrony.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/chrony/chrony/chrony.conf
rename to meta-openembedded/meta-networking/recipes-support/chrony/chrony/chrony.conf
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/chrony/chrony/chronyd b/meta-openembedded/meta-networking/recipes-support/chrony/chrony/chronyd
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/chrony/chrony/chronyd
rename to meta-openembedded/meta-networking/recipes-support/chrony/chrony/chronyd
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/chrony/chrony_3.2.bb b/meta-openembedded/meta-networking/recipes-support/chrony/chrony_3.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/chrony/chrony_3.2.bb
rename to meta-openembedded/meta-networking/recipes-support/chrony/chrony_3.2.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_git.bb b/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_git.bb
rename to meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_git.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/cifs/files/0001-mount.cifs-Remove-data_blob.h-include.patch b/meta-openembedded/meta-networking/recipes-support/cifs/files/0001-mount.cifs-Remove-data_blob.h-include.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/cifs/files/0001-mount.cifs-Remove-data_blob.h-include.patch
rename to meta-openembedded/meta-networking/recipes-support/cifs/files/0001-mount.cifs-Remove-data_blob.h-include.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-docs_2.40.0.bb b/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-docs_2.40.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-docs_2.40.0.bb
rename to meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-docs_2.40.0.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.50.0.bb b/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.50.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.50.0.bb
rename to meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.50.0.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-final_2.40.0.bb b/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-final_2.40.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-final_2.40.0.bb
rename to meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-final_2.40.0.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema.inc b/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema.inc
rename to meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema.inc
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema/files/LICENSE b/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema/files/LICENSE
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema/files/LICENSE
rename to meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema/files/LICENSE
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/cim-schema/files/LICENSE b/meta-openembedded/meta-networking/recipes-support/cim-schema/files/LICENSE
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/cim-schema/files/LICENSE
rename to meta-openembedded/meta-networking/recipes-support/cim-schema/files/LICENSE
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ctdb/ctdb/01-support-cross-compile-for-linux-os.patch b/meta-openembedded/meta-networking/recipes-support/ctdb/ctdb/01-support-cross-compile-for-linux-os.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ctdb/ctdb/01-support-cross-compile-for-linux-os.patch
rename to meta-openembedded/meta-networking/recipes-support/ctdb/ctdb/01-support-cross-compile-for-linux-os.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ctdb/ctdb/02-link-rep_snprintf-for-ltdbtool.patch b/meta-openembedded/meta-networking/recipes-support/ctdb/ctdb/02-link-rep_snprintf-for-ltdbtool.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ctdb/ctdb/02-link-rep_snprintf-for-ltdbtool.patch
rename to meta-openembedded/meta-networking/recipes-support/ctdb/ctdb/02-link-rep_snprintf-for-ltdbtool.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ctdb/ctdb/service-ensure-the-PID-directory-is-created.patch b/meta-openembedded/meta-networking/recipes-support/ctdb/ctdb/service-ensure-the-PID-directory-is-created.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ctdb/ctdb/service-ensure-the-PID-directory-is-created.patch
rename to meta-openembedded/meta-networking/recipes-support/ctdb/ctdb/service-ensure-the-PID-directory-is-created.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb b/meta-openembedded/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb
rename to meta-openembedded/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb b/meta-openembedded/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb
rename to meta-openembedded/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq.inc b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
rename to meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch
rename to meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.78.bb b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.78.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.78.bb
rename to meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.78.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/99_dnsmasq b/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/99_dnsmasq
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/99_dnsmasq
rename to meta-openembedded/meta-networking/recipes-support/dnsmasq/files/99_dnsmasq
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq-noresolvconf.service b/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq-noresolvconf.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq-noresolvconf.service
rename to meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq-noresolvconf.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolvconf-helper b/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolvconf-helper
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolvconf-helper
rename to meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolvconf-helper
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service b/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service
rename to meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq.conf b/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq.conf
rename to meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq.conf
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq.resolvconf b/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq.resolvconf
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq.resolvconf
rename to meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq.resolvconf
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/init b/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/init
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/init
rename to meta-openembedded/meta-networking/recipes-support/dnsmasq/files/init
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/dnssec-conf/dnssec-conf_2.02.bb b/meta-openembedded/meta-networking/recipes-support/dnssec-conf/dnssec-conf_2.02.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/dnssec-conf/dnssec-conf_2.02.bb
rename to meta-openembedded/meta-networking/recipes-support/dnssec-conf/dnssec-conf_2.02.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch
rename to meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-doveadm-Fix-parallel-build.patch b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-doveadm-Fix-parallel-build.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-doveadm-Fix-parallel-build.patch
rename to meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/0001-doveadm-Fix-parallel-build.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/dovecot.service b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/dovecot.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/dovecot.service
rename to meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/dovecot.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/dovecot.socket b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/dovecot.socket
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/dovecot.socket
rename to meta-openembedded/meta-networking/recipes-support/dovecot/dovecot/dovecot.socket
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.33.bb b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.33.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.33.bb
rename to meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.33.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-Makefile.in-fix-permission-bits-for-drbd.service.patch b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-Makefile.in-fix-permission-bits-for-drbd.service.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-Makefile.in-fix-permission-bits-for-drbd.service.patch
rename to meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-Makefile.in-fix-permission-bits-for-drbd.service.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_8.9.6.bb b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_8.9.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_8.9.6.bb
rename to meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_8.9.6.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/drbd/drbd/check_existence_of_modules_before_installing.patch b/meta-openembedded/meta-networking/recipes-support/drbd/drbd/check_existence_of_modules_before_installing.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/drbd/drbd/check_existence_of_modules_before_installing.patch
rename to meta-openembedded/meta-networking/recipes-support/drbd/drbd/check_existence_of_modules_before_installing.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.8-1.bb b/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.8-1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.8-1.bb
rename to meta-openembedded/meta-networking/recipes-support/drbd/drbd_9.0.8-1.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/esmtp/esmtp_1.2.bb b/meta-openembedded/meta-networking/recipes-support/esmtp/esmtp_1.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/esmtp/esmtp_1.2.bb
rename to meta-openembedded/meta-networking/recipes-support/esmtp/esmtp_1.2.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.3.26.bb b/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.3.26.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.3.26.bb
rename to meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.3.26.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/fping/fping_3.5.bb b/meta-openembedded/meta-networking/recipes-support/fping/fping_3.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/fping/fping_3.5.bb
rename to meta-openembedded/meta-networking/recipes-support/fping/fping_3.5.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop_2.6.9.bb b/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop_2.6.9.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop_2.6.9.bb
rename to meta-openembedded/meta-networking/recipes-support/fwknop/fwknop_2.6.9.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/files/run-ptest b/meta-openembedded/meta-networking/recipes-support/geoip/files/run-ptest
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/geoip/files/run-ptest
rename to meta-openembedded/meta-networking/recipes-support/geoip/files/run-ptest
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoip-perl/run-ptest b/meta-openembedded/meta-networking/recipes-support/geoip/geoip-perl/run-ptest
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoip-perl/run-ptest
rename to meta-openembedded/meta-networking/recipes-support/geoip/geoip-perl/run-ptest
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoip-perl_1.50.bb b/meta-openembedded/meta-networking/recipes-support/geoip/geoip-perl_1.50.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoip-perl_1.50.bb
rename to meta-openembedded/meta-networking/recipes-support/geoip/geoip-perl_1.50.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoip_1.6.11.bb b/meta-openembedded/meta-networking/recipes-support/geoip/geoip_1.6.11.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoip_1.6.11.bb
rename to meta-openembedded/meta-networking/recipes-support/geoip/geoip_1.6.11.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate-2.5.0/GeoIP.conf b/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate-2.5.0/GeoIP.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate-2.5.0/GeoIP.conf
rename to meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate-2.5.0/GeoIP.conf
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate-2.5.0/geoipupdate.cron b/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate-2.5.0/geoipupdate.cron
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate-2.5.0/geoipupdate.cron
rename to meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate-2.5.0/geoipupdate.cron
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate_2.5.0.bb b/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate_2.5.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate_2.5.0.bb
rename to meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate_2.5.0.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ifenslave/ifenslave_2.9.bb b/meta-openembedded/meta-networking/recipes-support/ifenslave/ifenslave_2.9.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ifenslave/ifenslave_2.9.bb
rename to meta-openembedded/meta-networking/recipes-support/ifenslave/ifenslave_2.9.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/iftop/iftop_1.0pre4.bb b/meta-openembedded/meta-networking/recipes-support/iftop/iftop_1.0pre4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/iftop/iftop_1.0pre4.bb
rename to meta-openembedded/meta-networking/recipes-support/iftop/iftop_1.0pre4.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ipcalc/ipcalc/0001-Makefile-pass-extra-linker-flags.patch b/meta-openembedded/meta-networking/recipes-support/ipcalc/ipcalc/0001-Makefile-pass-extra-linker-flags.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ipcalc/ipcalc/0001-Makefile-pass-extra-linker-flags.patch
rename to meta-openembedded/meta-networking/recipes-support/ipcalc/ipcalc/0001-Makefile-pass-extra-linker-flags.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ipcalc/ipcalc_0.2.2.bb b/meta-openembedded/meta-networking/recipes-support/ipcalc/ipcalc_0.2.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ipcalc/ipcalc_0.2.2.bb
rename to meta-openembedded/meta-networking/recipes-support/ipcalc/ipcalc_0.2.2.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0001-Fix-build-with-clang.patch b/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0001-Fix-build-with-clang.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0001-Fix-build-with-clang.patch
rename to meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0001-Fix-build-with-clang.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0001-Fix-header-issues-found-with-musl-libc.patch b/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0001-Fix-header-issues-found-with-musl-libc.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0001-Fix-header-issues-found-with-musl-libc.patch
rename to meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0001-Fix-header-issues-found-with-musl-libc.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0001-racoon-pfkey-avoid-potential-null-pointer-dereferenc.patch b/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0001-racoon-pfkey-avoid-potential-null-pointer-dereferenc.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0001-racoon-pfkey-avoid-potential-null-pointer-dereferenc.patch
rename to meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0001-racoon-pfkey-avoid-potential-null-pointer-dereferenc.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0002-Don-t-link-against-libfl.patch b/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0002-Don-t-link-against-libfl.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0002-Don-t-link-against-libfl.patch
rename to meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0002-Don-t-link-against-libfl.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0002-cfparse-clear-memory-equal-to-size-of-array.patch b/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0002-cfparse-clear-memory-equal-to-size-of-array.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0002-cfparse-clear-memory-equal-to-size-of-array.patch
rename to meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0002-cfparse-clear-memory-equal-to-size-of-array.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/configure.patch b/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/configure.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/configure.patch
rename to meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/configure.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/fix-CVE-2015-4047.patch b/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/fix-CVE-2015-4047.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/fix-CVE-2015-4047.patch
rename to meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/fix-CVE-2015-4047.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/fix-CVE-2016-10396.patch b/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/fix-CVE-2016-10396.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/fix-CVE-2016-10396.patch
rename to meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/fix-CVE-2016-10396.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/glibc-2.20.patch b/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/glibc-2.20.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/glibc-2.20.patch
rename to meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/glibc-2.20.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon-Resend-UPDATE-message-when-received-EINTR-message.patch b/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon-Resend-UPDATE-message-when-received-EINTR-message.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon-Resend-UPDATE-message-when-received-EINTR-message.patch
rename to meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon-Resend-UPDATE-message-when-received-EINTR-message.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon-check-invalid-ivm.patch b/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon-check-invalid-ivm.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon-check-invalid-ivm.patch
rename to meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon-check-invalid-ivm.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon-check-invalid-pointers.patch b/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon-check-invalid-pointers.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon-check-invalid-pointers.patch
rename to meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon-check-invalid-pointers.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon.conf b/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon.conf
rename to meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon.conf
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon.conf.sample b/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon.conf.sample
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon.conf.sample
rename to meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon.conf.sample
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon.service b/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon.service
rename to meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools/racoon.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb b/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb
rename to meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm/0001-Modify-the-Makefile-for-cross-compile.patch b/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm/0001-Modify-the-Makefile-for-cross-compile.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm/0001-Modify-the-Makefile-for-cross-compile.patch
rename to meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm/0001-Modify-the-Makefile-for-cross-compile.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm/0002-Replace-nl_handle-to-nl_sock.patch b/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm/0002-Replace-nl_handle-to-nl_sock.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm/0002-Replace-nl_handle-to-nl_sock.patch
rename to meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm/0002-Replace-nl_handle-to-nl_sock.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm/0003-ipvsadm-remove-dependency-on-bash.patch b/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm/0003-ipvsadm-remove-dependency-on-bash.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm/0003-ipvsadm-remove-dependency-on-bash.patch
rename to meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm/0003-ipvsadm-remove-dependency-on-bash.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm/makefile-add-ldflags.patch b/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm/makefile-add-ldflags.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm/makefile-add-ldflags.patch
rename to meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm/makefile-add-ldflags.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm_1.26.bb b/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm_1.26.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm_1.26.bb
rename to meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm_1.26.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp/include-topdir.patch b/meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp/include-topdir.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp/include-topdir.patch
rename to meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp/include-topdir.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp/snprintf.patch b/meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp/snprintf.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp/snprintf.patch
rename to meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp/snprintf.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp_1.0.6.bb b/meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp_1.0.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp_1.0.6.bb
rename to meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp_1.0.6.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libldb/libldb/avoid-openldap-unless-wanted.patch b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/avoid-openldap-unless-wanted.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/libldb/libldb/avoid-openldap-unless-wanted.patch
rename to meta-openembedded/meta-networking/recipes-support/libldb/libldb/avoid-openldap-unless-wanted.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libldb/libldb/do-not-import-target-module-while-cross-compile.patch b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/do-not-import-target-module-while-cross-compile.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/libldb/libldb/do-not-import-target-module-while-cross-compile.patch
rename to meta-openembedded/meta-networking/recipes-support/libldb/libldb/do-not-import-target-module-while-cross-compile.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libldb/libldb/options-1.3.1.patch b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/options-1.3.1.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/libldb/libldb/options-1.3.1.patch
rename to meta-openembedded/meta-networking/recipes-support/libldb/libldb/options-1.3.1.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.3.1.bb b/meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.3.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.3.1.bb
rename to meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.3.1.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libmemcached/files/0001-Fix-comparison-types.patch b/meta-openembedded/meta-networking/recipes-support/libmemcached/files/0001-Fix-comparison-types.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/libmemcached/files/0001-Fix-comparison-types.patch
rename to meta-openembedded/meta-networking/recipes-support/libmemcached/files/0001-Fix-comparison-types.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libmemcached/files/0001-configure.ac-Do-not-configure-build-aux.patch b/meta-openembedded/meta-networking/recipes-support/libmemcached/files/0001-configure.ac-Do-not-configure-build-aux.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/libmemcached/files/0001-configure.ac-Do-not-configure-build-aux.patch
rename to meta-openembedded/meta-networking/recipes-support/libmemcached/files/0001-configure.ac-Do-not-configure-build-aux.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libmemcached/files/0002-POSIX_SPAWN_USEVFORK-is-not-linux-specific-but-glibc.patch b/meta-openembedded/meta-networking/recipes-support/libmemcached/files/0002-POSIX_SPAWN_USEVFORK-is-not-linux-specific-but-glibc.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/libmemcached/files/0002-POSIX_SPAWN_USEVFORK-is-not-linux-specific-but-glibc.patch
rename to meta-openembedded/meta-networking/recipes-support/libmemcached/files/0002-POSIX_SPAWN_USEVFORK-is-not-linux-specific-but-glibc.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libmemcached/files/crosscompile.patch b/meta-openembedded/meta-networking/recipes-support/libmemcached/files/crosscompile.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/libmemcached/files/crosscompile.patch
rename to meta-openembedded/meta-networking/recipes-support/libmemcached/files/crosscompile.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libmemcached/libmemcached.inc b/meta-openembedded/meta-networking/recipes-support/libmemcached/libmemcached.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/libmemcached/libmemcached.inc
rename to meta-openembedded/meta-networking/recipes-support/libmemcached/libmemcached.inc
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libmemcached/libmemcached_1.0.18.bb b/meta-openembedded/meta-networking/recipes-support/libmemcached/libmemcached_1.0.18.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/libmemcached/libmemcached_1.0.18.bb
rename to meta-openembedded/meta-networking/recipes-support/libmemcached/libmemcached_1.0.18.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libmemcached/libmemcached_1.0.7.bb b/meta-openembedded/meta-networking/recipes-support/libmemcached/libmemcached_1.0.7.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/libmemcached/libmemcached_1.0.7.bb
rename to meta-openembedded/meta-networking/recipes-support/libmemcached/libmemcached_1.0.7.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/avoid-attr-unless-wanted.patch b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/avoid-attr-unless-wanted.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/avoid-attr-unless-wanted.patch
rename to meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/avoid-attr-unless-wanted.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/options-2.1.10.patch b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/options-2.1.10.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/options-2.1.10.patch
rename to meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/options-2.1.10.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.1.11.bb b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.1.11.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.1.11.bb
rename to meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.1.11.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb/do-not-check-xsltproc-manpages.patch b/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb/do-not-check-xsltproc-manpages.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb/do-not-check-xsltproc-manpages.patch
rename to meta-openembedded/meta-networking/recipes-support/libtdb/libtdb/do-not-check-xsltproc-manpages.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb/tdb-Add-configure-options-for-packages.patch b/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb/tdb-Add-configure-options-for-packages.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb/tdb-Add-configure-options-for-packages.patch
rename to meta-openembedded/meta-networking/recipes-support/libtdb/libtdb/tdb-Add-configure-options-for-packages.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.3.15.bb b/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.3.15.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.3.15.bb
rename to meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.3.15.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/avoid-attr-unless-wanted.patch b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/avoid-attr-unless-wanted.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/avoid-attr-unless-wanted.patch
rename to meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/avoid-attr-unless-wanted.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/options-0.9.36.patch b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/options-0.9.36.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/options-0.9.36.patch
rename to meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/options-0.9.36.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.9.36.bb b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.9.36.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.9.36.bb
rename to meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.9.36.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/0001-fix-compile-error-with-linux-kernel-v4.8.patch b/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/0001-fix-compile-error-with-linux-kernel-v4.8.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/0001-fix-compile-error-with-linux-kernel-v4.8.patch
rename to meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/0001-fix-compile-error-with-linux-kernel-v4.8.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/0001-ttcp-Add-printf-format-string.patch b/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/0001-ttcp-Add-printf-format-string.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/0001-ttcp-Add-printf-format-string.patch
rename to meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/0001-ttcp-Add-printf-format-string.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/0002-sigd-Replace-on_exit-API-with-atexit.patch b/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/0002-sigd-Replace-on_exit-API-with-atexit.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/0002-sigd-Replace-on_exit-API-with-atexit.patch
rename to meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/0002-sigd-Replace-on_exit-API-with-atexit.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/0003-mpoad-Drop-old-hack-to-compile-with-very-old-glibc.patch b/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/0003-mpoad-Drop-old-hack-to-compile-with-very-old-glibc.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/0003-mpoad-Drop-old-hack-to-compile-with-very-old-glibc.patch
rename to meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/0003-mpoad-Drop-old-hack-to-compile-with-very-old-glibc.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/install-from-buildir.patch b/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/install-from-buildir.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/install-from-buildir.patch
rename to meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/install-from-buildir.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/link-with-ldflags.patch b/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/link-with-ldflags.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/link-with-ldflags.patch
rename to meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/link-with-ldflags.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb b/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb
rename to meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/run-ptest b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/run-ptest
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/run-ptest
rename to meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/run-ptest
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/v4test.sh b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/v4test.sh
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/v4test.sh
rename to meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/v4test.sh
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/v6test.sh b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/v6test.sh
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/v6test.sh
rename to meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools/v6test.sh
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.17.bb b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.17.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.17.bb
rename to meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.17.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Fix-build-errors-with-clang.patch b/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Fix-build-errors-with-clang.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Fix-build-errors-with-clang.patch
rename to meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Fix-build-errors-with-clang.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Remove-newline-from-format-line.patch b/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Remove-newline-from-format-line.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Remove-newline-from-format-line.patch
rename to meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Remove-newline-from-format-line.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch b/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch
rename to meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-coordinator-Fix-strncpy-range-warning.patch b/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-coordinator-Fix-strncpy-range-warning.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-coordinator-Fix-strncpy-range-warning.patch
rename to meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-coordinator-Fix-strncpy-range-warning.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-src-iz.c-Undef-dprintf-before-redefining.patch b/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-src-iz.c-Undef-dprintf-before-redefining.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-src-iz.c-Undef-dprintf-before-redefining.patch
rename to meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-src-iz.c-Undef-dprintf-before-redefining.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools/no-help2man.patch b/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools/no-help2man.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools/no-help2man.patch
rename to meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools/no-help2man.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb b/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb
rename to meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/macchanger/macchanger_1.5.0.bb b/meta-openembedded/meta-networking/recipes-support/macchanger/macchanger_1.5.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/macchanger/macchanger_1.5.0.bb
rename to meta-openembedded/meta-networking/recipes-support/macchanger/macchanger_1.5.0.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/memcached/memcached/memcached-add-hugetlbfs-check.patch b/meta-openembedded/meta-networking/recipes-support/memcached/memcached/memcached-add-hugetlbfs-check.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/memcached/memcached/memcached-add-hugetlbfs-check.patch
rename to meta-openembedded/meta-networking/recipes-support/memcached/memcached/memcached-add-hugetlbfs-check.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/memcached/memcached_1.5.0.bb b/meta-openembedded/meta-networking/recipes-support/memcached/memcached_1.5.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/memcached/memcached_1.5.0.bb
rename to meta-openembedded/meta-networking/recipes-support/memcached/memcached_1.5.0.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.87.bb b/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.87.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.87.bb
rename to meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.87.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/nbd/nbd_3.11.bb b/meta-openembedded/meta-networking/recipes-support/nbd/nbd_3.11.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/nbd/nbd_3.11.bb
rename to meta-openembedded/meta-networking/recipes-support/nbd/nbd_3.11.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ncp/libowfat_0.31.bb b/meta-openembedded/meta-networking/recipes-support/ncp/libowfat_0.31.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ncp/libowfat_0.31.bb
rename to meta-openembedded/meta-networking/recipes-support/ncp/libowfat_0.31.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ncp/ncp_1.2.4.bb b/meta-openembedded/meta-networking/recipes-support/ncp/ncp_1.2.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ncp/ncp_1.2.4.bb
rename to meta-openembedded/meta-networking/recipes-support/ncp/ncp_1.2.4.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6/0001-autogen-Do-not-symlink-gettext.h-from-build-host.patch b/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6/0001-autogen-Do-not-symlink-gettext.h-from-build-host.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6/0001-autogen-Do-not-symlink-gettext.h-from-build-host.patch
rename to meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6/0001-autogen-Do-not-symlink-gettext.h-from-build-host.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6/0001-replace-VLAIS-with-malloc-free-pair.patch b/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6/0001-replace-VLAIS-with-malloc-free-pair.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6/0001-replace-VLAIS-with-malloc-free-pair.patch
rename to meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6/0001-replace-VLAIS-with-malloc-free-pair.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6/0002-Do-not-undef-_GNU_SOURCE.patch b/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6/0002-Do-not-undef-_GNU_SOURCE.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6/0002-Do-not-undef-_GNU_SOURCE.patch
rename to meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6/0002-Do-not-undef-_GNU_SOURCE.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_git.bb b/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_git.bb
rename to meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_git.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/netcat/netcat-openbsd/0001-bundle-own-base64-encode-decode-functions.patch b/meta-openembedded/meta-networking/recipes-support/netcat/netcat-openbsd/0001-bundle-own-base64-encode-decode-functions.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/netcat/netcat-openbsd/0001-bundle-own-base64-encode-decode-functions.patch
rename to meta-openembedded/meta-networking/recipes-support/netcat/netcat-openbsd/0001-bundle-own-base64-encode-decode-functions.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb b/meta-openembedded/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb
rename to meta-openembedded/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/netcat/netcat.inc b/meta-openembedded/meta-networking/recipes-support/netcat/netcat.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/netcat/netcat.inc
rename to meta-openembedded/meta-networking/recipes-support/netcat/netcat.inc
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/netcat/netcat/make-netcat_flag_count_work.patch b/meta-openembedded/meta-networking/recipes-support/netcat/netcat/make-netcat_flag_count_work.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/netcat/netcat/make-netcat_flag_count_work.patch
rename to meta-openembedded/meta-networking/recipes-support/netcat/netcat/make-netcat_flag_count_work.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/netcat/netcat/netcat-locale_h.patch b/meta-openembedded/meta-networking/recipes-support/netcat/netcat/netcat-locale_h.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/netcat/netcat/netcat-locale_h.patch
rename to meta-openembedded/meta-networking/recipes-support/netcat/netcat/netcat-locale_h.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/netcat/netcat/obsolete_autoconf_macros.patch b/meta-openembedded/meta-networking/recipes-support/netcat/netcat/obsolete_autoconf_macros.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/netcat/netcat/obsolete_autoconf_macros.patch
rename to meta-openembedded/meta-networking/recipes-support/netcat/netcat/obsolete_autoconf_macros.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/netcat/netcat_0.7.1.bb b/meta-openembedded/meta-networking/recipes-support/netcat/netcat_0.7.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/netcat/netcat_0.7.1.bb
rename to meta-openembedded/meta-networking/recipes-support/netcat/netcat_0.7.1.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/netcf/netcf_0.2.8.bb b/meta-openembedded/meta-networking/recipes-support/netcf/netcf_0.2.8.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/netcf/netcf_0.2.8.bb
rename to meta-openembedded/meta-networking/recipes-support/netcf/netcf_0.2.8.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/netperf/files/cpu_set.patch b/meta-openembedded/meta-networking/recipes-support/netperf/files/cpu_set.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/netperf/files/cpu_set.patch
rename to meta-openembedded/meta-networking/recipes-support/netperf/files/cpu_set.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/netperf/files/init b/meta-openembedded/meta-networking/recipes-support/netperf/files/init
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/netperf/files/init
rename to meta-openembedded/meta-networking/recipes-support/netperf/files/init
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/netperf/files/vfork.patch b/meta-openembedded/meta-networking/recipes-support/netperf/files/vfork.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/netperf/files/vfork.patch
rename to meta-openembedded/meta-networking/recipes-support/netperf/files/vfork.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/netperf/netperf_git.bb b/meta-openembedded/meta-networking/recipes-support/netperf/netperf_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/netperf/netperf_git.bb
rename to meta-openembedded/meta-networking/recipes-support/netperf/netperf_git.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.26.0.bb b/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.26.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.26.0.bb
rename to meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.26.0.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/nis/files/ypbind.init b/meta-openembedded/meta-networking/recipes-support/nis/files/ypbind.init
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/nis/files/ypbind.init
rename to meta-openembedded/meta-networking/recipes-support/nis/files/ypbind.init
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/nis/nis.inc b/meta-openembedded/meta-networking/recipes-support/nis/nis.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/nis/nis.inc
rename to meta-openembedded/meta-networking/recipes-support/nis/nis.inc
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/nis/yp-tools/domainname.service b/meta-openembedded/meta-networking/recipes-support/nis/yp-tools/domainname.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/nis/yp-tools/domainname.service
rename to meta-openembedded/meta-networking/recipes-support/nis/yp-tools/domainname.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/nis/yp-tools_2.14.bb b/meta-openembedded/meta-networking/recipes-support/nis/yp-tools_2.14.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/nis/yp-tools_2.14.bb
rename to meta-openembedded/meta-networking/recipes-support/nis/yp-tools_2.14.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/nis/yp-tools_4.2.3.bb b/meta-openembedded/meta-networking/recipes-support/nis/yp-tools_4.2.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/nis/yp-tools_4.2.3.bb
rename to meta-openembedded/meta-networking/recipes-support/nis/yp-tools_4.2.3.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/nis/ypbind-mt/0001-dns_hosts-Fix-build-with-musl.patch b/meta-openembedded/meta-networking/recipes-support/nis/ypbind-mt/0001-dns_hosts-Fix-build-with-musl.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/nis/ypbind-mt/0001-dns_hosts-Fix-build-with-musl.patch
rename to meta-openembedded/meta-networking/recipes-support/nis/ypbind-mt/0001-dns_hosts-Fix-build-with-musl.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/nis/ypbind-mt/ypbind.service b/meta-openembedded/meta-networking/recipes-support/nis/ypbind-mt/ypbind.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/nis/ypbind-mt/ypbind.service
rename to meta-openembedded/meta-networking/recipes-support/nis/ypbind-mt/ypbind.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/nis/ypbind-mt_2.4.bb b/meta-openembedded/meta-networking/recipes-support/nis/ypbind-mt_2.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/nis/ypbind-mt_2.4.bb
rename to meta-openembedded/meta-networking/recipes-support/nis/ypbind-mt_2.4.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ntimed/ntimed/use-ldflags.patch b/meta-openembedded/meta-networking/recipes-support/ntimed/ntimed/use-ldflags.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ntimed/ntimed/use-ldflags.patch
rename to meta-openembedded/meta-networking/recipes-support/ntimed/ntimed/use-ldflags.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ntimed/ntimed_git.bb b/meta-openembedded/meta-networking/recipes-support/ntimed/ntimed_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ntimed/ntimed_git.bb
rename to meta-openembedded/meta-networking/recipes-support/ntimed/ntimed_git.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ntop/ntop/0001-nDPI-Include-sys-types.h.patch b/meta-openembedded/meta-networking/recipes-support/ntop/ntop/0001-nDPI-Include-sys-types.h.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ntop/ntop/0001-nDPI-Include-sys-types.h.patch
rename to meta-openembedded/meta-networking/recipes-support/ntop/ntop/0001-nDPI-Include-sys-types.h.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop.service b/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop.service
rename to meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop_configure_in.patch b/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop_configure_in.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop_configure_in.patch
rename to meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop_configure_in.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop_configure_in_net_snmp_config_exist.patch b/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop_configure_in_net_snmp_config_exist.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop_configure_in_net_snmp_config_exist.patch
rename to meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop_configure_in_net_snmp_config_exist.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop_init.patch b/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop_init.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop_init.patch
rename to meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop_init.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop_webInterface.patch b/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop_webInterface.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop_webInterface.patch
rename to meta-openembedded/meta-networking/recipes-support/ntop/ntop/ntop_webInterface.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ntop/ntop/use-static-inline.patch b/meta-openembedded/meta-networking/recipes-support/ntop/ntop/use-static-inline.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ntop/ntop/use-static-inline.patch
rename to meta-openembedded/meta-networking/recipes-support/ntop/ntop/use-static-inline.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ntop/ntop_5.0.1.bb b/meta-openembedded/meta-networking/recipes-support/ntop/ntop_5.0.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ntop/ntop_5.0.1.bb
rename to meta-openembedded/meta-networking/recipes-support/ntop/ntop_5.0.1.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntp-4.2.4_p6-nano.patch b/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntp-4.2.4_p6-nano.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntp-4.2.4_p6-nano.patch
rename to meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntp-4.2.4_p6-nano.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntp.conf b/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntp.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntp.conf
rename to meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntp.conf
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpd b/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpd
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpd
rename to meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpd
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpd.list b/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpd.list
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpd.list
rename to meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpd.list
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpd.service b/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpd.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpd.service
rename to meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpd.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpdate b/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpdate
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpdate
rename to meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpdate
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpdate.default b/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpdate.default
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpdate.default
rename to meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpdate.default
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpdate.service b/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpdate.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpdate.service
rename to meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpdate.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ntp/ntp/sntp b/meta-openembedded/meta-networking/recipes-support/ntp/ntp/sntp
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ntp/ntp/sntp
rename to meta-openembedded/meta-networking/recipes-support/ntp/ntp/sntp
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ntp/ntp/sntp.service b/meta-openembedded/meta-networking/recipes-support/ntp/ntp/sntp.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ntp/ntp/sntp.service
rename to meta-openembedded/meta-networking/recipes-support/ntp/ntp/sntp.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p11.bb b/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p11.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p11.bb
rename to meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p11.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/nuttcp/nuttcp_7.2.1.bb b/meta-openembedded/meta-networking/recipes-support/nuttcp/nuttcp_7.2.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/nuttcp/nuttcp_7.2.1.bb
rename to meta-openembedded/meta-networking/recipes-support/nuttcp/nuttcp_7.2.1.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/open-isns/open-isns/0001-util.h-endian.h-is-available-on-musl-on-linux.patch b/meta-openembedded/meta-networking/recipes-support/open-isns/open-isns/0001-util.h-endian.h-is-available-on-musl-on-linux.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/open-isns/open-isns/0001-util.h-endian.h-is-available-on-musl-on-linux.patch
rename to meta-openembedded/meta-networking/recipes-support/open-isns/open-isns/0001-util.h-endian.h-is-available-on-musl-on-linux.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/open-isns/open-isns_0.97.bb b/meta-openembedded/meta-networking/recipes-support/open-isns/open-isns_0.97.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/open-isns/open-isns_0.97.bb
rename to meta-openembedded/meta-networking/recipes-support/open-isns/open-isns_0.97.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/openipmi/files/0001-lanserv-Rename-struct-parameter-printf-for-namespace.patch b/meta-openembedded/meta-networking/recipes-support/openipmi/files/0001-lanserv-Rename-struct-parameter-printf-for-namespace.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/openipmi/files/0001-lanserv-Rename-struct-parameter-printf-for-namespace.patch
rename to meta-openembedded/meta-networking/recipes-support/openipmi/files/0001-lanserv-Rename-struct-parameter-printf-for-namespace.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/openipmi/files/do-not-install-pyc-and-pyo.patch b/meta-openembedded/meta-networking/recipes-support/openipmi/files/do-not-install-pyc-and-pyo.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/openipmi/files/do-not-install-pyc-and-pyo.patch
rename to meta-openembedded/meta-networking/recipes-support/openipmi/files/do-not-install-pyc-and-pyo.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch b/meta-openembedded/meta-networking/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch
rename to meta-openembedded/meta-networking/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/openipmi/files/include_sys_types.patch b/meta-openembedded/meta-networking/recipes-support/openipmi/files/include_sys_types.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/openipmi/files/include_sys_types.patch
rename to meta-openembedded/meta-networking/recipes-support/openipmi/files/include_sys_types.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/openipmi/files/ipmi-init-fix-the-arguments.patch b/meta-openembedded/meta-networking/recipes-support/openipmi/files/ipmi-init-fix-the-arguments.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/openipmi/files/ipmi-init-fix-the-arguments.patch
rename to meta-openembedded/meta-networking/recipes-support/openipmi/files/ipmi-init-fix-the-arguments.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/openipmi/files/ipmi.service b/meta-openembedded/meta-networking/recipes-support/openipmi/files/ipmi.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/openipmi/files/ipmi.service
rename to meta-openembedded/meta-networking/recipes-support/openipmi/files/ipmi.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/openipmi/files/openipmi-helper b/meta-openembedded/meta-networking/recipes-support/openipmi/files/openipmi-helper
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/openipmi/files/openipmi-helper
rename to meta-openembedded/meta-networking/recipes-support/openipmi/files/openipmi-helper
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/openipmi/files/openipmi-no-openipmigui-man.patch b/meta-openembedded/meta-networking/recipes-support/openipmi/files/openipmi-no-openipmigui-man.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/openipmi/files/openipmi-no-openipmigui-man.patch
rename to meta-openembedded/meta-networking/recipes-support/openipmi/files/openipmi-no-openipmigui-man.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch b/meta-openembedded/meta-networking/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch
rename to meta-openembedded/meta-networking/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.24.bb b/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.24.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.24.bb
rename to meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.24.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/openvpn b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/openvpn
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/openvpn
rename to meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/openvpn
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/openvpn-volatile.conf b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/openvpn-volatile.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/openvpn-volatile.conf
rename to meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/openvpn-volatile.conf
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/openvpn@.service b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/openvpn@.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/openvpn@.service
rename to meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/openvpn@.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.4.4.bb b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.4.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.4.4.bb
rename to meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.4.4.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/phytool/phytool.bb b/meta-openembedded/meta-networking/recipes-support/phytool/phytool.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/phytool/phytool.bb
rename to meta-openembedded/meta-networking/recipes-support/phytool/phytool.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/pimd/pimd/0001-configure-Dont-use-uname-to-determine-target-OS.patch b/meta-openembedded/meta-networking/recipes-support/pimd/pimd/0001-configure-Dont-use-uname-to-determine-target-OS.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/pimd/pimd/0001-configure-Dont-use-uname-to-determine-target-OS.patch
rename to meta-openembedded/meta-networking/recipes-support/pimd/pimd/0001-configure-Dont-use-uname-to-determine-target-OS.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/pimd/pimd_2.3.2.bb b/meta-openembedded/meta-networking/recipes-support/pimd/pimd_2.3.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/pimd/pimd_2.3.2.bb
rename to meta-openembedded/meta-networking/recipes-support/pimd/pimd_2.3.2.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ruli/files/0001-Fix-build-with-format-string-checks.patch b/meta-openembedded/meta-networking/recipes-support/ruli/files/0001-Fix-build-with-format-string-checks.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ruli/files/0001-Fix-build-with-format-string-checks.patch
rename to meta-openembedded/meta-networking/recipes-support/ruli/files/0001-Fix-build-with-format-string-checks.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ruli/files/0001-src-ruli_addr.c-Add-missing-format-string.patch b/meta-openembedded/meta-networking/recipes-support/ruli/files/0001-src-ruli_addr.c-Add-missing-format-string.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ruli/files/0001-src-ruli_addr.c-Add-missing-format-string.patch
rename to meta-openembedded/meta-networking/recipes-support/ruli/files/0001-src-ruli_addr.c-Add-missing-format-string.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ruli/files/Makefile.patch b/meta-openembedded/meta-networking/recipes-support/ruli/files/Makefile.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ruli/files/Makefile.patch
rename to meta-openembedded/meta-networking/recipes-support/ruli/files/Makefile.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ruli/ruli_0.36.bb b/meta-openembedded/meta-networking/recipes-support/ruli/ruli_0.36.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ruli/ruli_0.36.bb
rename to meta-openembedded/meta-networking/recipes-support/ruli/ruli_0.36.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/smcroute/smcroute_2.0.0.bb b/meta-openembedded/meta-networking/recipes-support/smcroute/smcroute_2.0.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/smcroute/smcroute_2.0.0.bb
rename to meta-openembedded/meta-networking/recipes-support/smcroute/smcroute_2.0.0.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ssmping/files/0001-Makefile-tweak-install-dir.patch b/meta-openembedded/meta-networking/recipes-support/ssmping/files/0001-Makefile-tweak-install-dir.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ssmping/files/0001-Makefile-tweak-install-dir.patch
rename to meta-openembedded/meta-networking/recipes-support/ssmping/files/0001-Makefile-tweak-install-dir.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb b/meta-openembedded/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb
rename to meta-openembedded/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ssmtp/ssmtp/build-ouside_srcdir.patch b/meta-openembedded/meta-networking/recipes-support/ssmtp/ssmtp/build-ouside_srcdir.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ssmtp/ssmtp/build-ouside_srcdir.patch
rename to meta-openembedded/meta-networking/recipes-support/ssmtp/ssmtp/build-ouside_srcdir.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ssmtp/ssmtp/ssmtp-bug584162-fix.patch b/meta-openembedded/meta-networking/recipes-support/ssmtp/ssmtp/ssmtp-bug584162-fix.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ssmtp/ssmtp/ssmtp-bug584162-fix.patch
rename to meta-openembedded/meta-networking/recipes-support/ssmtp/ssmtp/ssmtp-bug584162-fix.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ssmtp/ssmtp/use-DESTDIR.patch b/meta-openembedded/meta-networking/recipes-support/ssmtp/ssmtp/use-DESTDIR.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ssmtp/ssmtp/use-DESTDIR.patch
rename to meta-openembedded/meta-networking/recipes-support/ssmtp/ssmtp/use-DESTDIR.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ssmtp/ssmtp_2.64.bb b/meta-openembedded/meta-networking/recipes-support/ssmtp/ssmtp_2.64.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/ssmtp/ssmtp_2.64.bb
rename to meta-openembedded/meta-networking/recipes-support/ssmtp/ssmtp_2.64.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/strongswan/files/0001-memory.h-Include-stdint.h-for-uintptr_t.patch b/meta-openembedded/meta-networking/recipes-support/strongswan/files/0001-memory.h-Include-stdint.h-for-uintptr_t.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/strongswan/files/0001-memory.h-Include-stdint.h-for-uintptr_t.patch
rename to meta-openembedded/meta-networking/recipes-support/strongswan/files/0001-memory.h-Include-stdint.h-for-uintptr_t.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/strongswan/files/fix-funtion-parameter.patch b/meta-openembedded/meta-networking/recipes-support/strongswan/files/fix-funtion-parameter.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/strongswan/files/fix-funtion-parameter.patch
rename to meta-openembedded/meta-networking/recipes-support/strongswan/files/fix-funtion-parameter.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.6.2.bb b/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.6.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.6.2.bb
rename to meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.6.2.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch b/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch
rename to meta-openembedded/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.35.bb b/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.35.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.35.bb
rename to meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.35.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch
rename to meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/add-ptest.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest
rename to meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch
rename to meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/unnecessary-to-check-libpcap.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.2.bb b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.2.bb
rename to meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.9.2.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice/tcpslice-1.2a3-time.patch b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice/tcpslice-1.2a3-time.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice/tcpslice-1.2a3-time.patch
rename to meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice/tcpslice-1.2a3-time.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice/tcpslice-CVS.20010207-bpf.patch b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice/tcpslice-CVS.20010207-bpf.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice/tcpslice-CVS.20010207-bpf.patch
rename to meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice/tcpslice-CVS.20010207-bpf.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice_1.2a3.bb b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice_1.2a3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice_1.2a3.bb
rename to meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice_1.2a3.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.2.6.bb b/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.2.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.2.6.bb
rename to meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.2.6.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy/disable-documentation.patch b/meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy/disable-documentation.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy/disable-documentation.patch
rename to meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy/disable-documentation.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy/tinyproxy.service b/meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy/tinyproxy.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy/tinyproxy.service
rename to meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy/tinyproxy.service
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy_1.8.4.bb b/meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy_1.8.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy_1.8.4.bb
rename to meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy_1.8.4.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/tnftp/tnftp/tnftp-autotools.patch b/meta-openembedded/meta-networking/recipes-support/tnftp/tnftp/tnftp-autotools.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/tnftp/tnftp/tnftp-autotools.patch
rename to meta-openembedded/meta-networking/recipes-support/tnftp/tnftp/tnftp-autotools.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/tnftp/tnftp_20151004.bb b/meta-openembedded/meta-networking/recipes-support/tnftp/tnftp_20151004.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/tnftp/tnftp_20151004.bb
rename to meta-openembedded/meta-networking/recipes-support/tnftp/tnftp_20151004.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute/filter-out-the-patches-from-subdirs.patch b/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute/filter-out-the-patches-from-subdirs.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute/filter-out-the-patches-from-subdirs.patch
rename to meta-openembedded/meta-networking/recipes-support/traceroute/traceroute/filter-out-the-patches-from-subdirs.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.0.bb b/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.0.bb
rename to meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.0.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/tunctl/tunctl.inc b/meta-openembedded/meta-networking/recipes-support/tunctl/tunctl.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/tunctl/tunctl.inc
rename to meta-openembedded/meta-networking/recipes-support/tunctl/tunctl.inc
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/tunctl/tunctl/makefile-add-ldflags.patch b/meta-openembedded/meta-networking/recipes-support/tunctl/tunctl/makefile-add-ldflags.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/tunctl/tunctl/makefile-add-ldflags.patch
rename to meta-openembedded/meta-networking/recipes-support/tunctl/tunctl/makefile-add-ldflags.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/tunctl/tunctl_1.5.bb b/meta-openembedded/meta-networking/recipes-support/tunctl/tunctl_1.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/tunctl/tunctl_1.5.bb
rename to meta-openembedded/meta-networking/recipes-support/tunctl/tunctl_1.5.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/uftp/uftp_4.9.3.bb b/meta-openembedded/meta-networking/recipes-support/uftp/uftp_4.9.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/uftp/uftp_4.9.3.bb
rename to meta-openembedded/meta-networking/recipes-support/uftp/uftp_4.9.3.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/wireshark/README b/meta-openembedded/meta-networking/recipes-support/wireshark/README
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/wireshark/README
rename to meta-openembedded/meta-networking/recipes-support/wireshark/README
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/wireshark/files/libgcrypt.patch b/meta-openembedded/meta-networking/recipes-support/wireshark/files/libgcrypt.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/wireshark/files/libgcrypt.patch
rename to meta-openembedded/meta-networking/recipes-support/wireshark/files/libgcrypt.patch
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_2.4.6.bb b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_2.4.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_2.4.6.bb
rename to meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_2.4.6.bb
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/wpan-tools/wpan-tools_git.bb b/meta-openembedded/meta-networking/recipes-support/wpan-tools/wpan-tools_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/recipes-support/wpan-tools/wpan-tools_git.bb
rename to meta-openembedded/meta-networking/recipes-support/wpan-tools/wpan-tools_git.bb
diff --git a/import-layers/meta-openembedded/meta-networking/site/endian-big b/meta-openembedded/meta-networking/site/endian-big
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/site/endian-big
rename to meta-openembedded/meta-networking/site/endian-big
diff --git a/import-layers/meta-openembedded/meta-networking/site/endian-little b/meta-openembedded/meta-networking/site/endian-little
similarity index 100%
rename from import-layers/meta-openembedded/meta-networking/site/endian-little
rename to meta-openembedded/meta-networking/site/endian-little
diff --git a/import-layers/meta-openembedded/meta-oe/COPYING.MIT b/meta-openembedded/meta-oe/COPYING.MIT
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/COPYING.MIT
rename to meta-openembedded/meta-oe/COPYING.MIT
diff --git a/import-layers/meta-openembedded/meta-oe/README b/meta-openembedded/meta-oe/README
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/README
rename to meta-openembedded/meta-oe/README
diff --git a/import-layers/meta-openembedded/meta-oe/classes/breakpad.bbclass b/meta-openembedded/meta-oe/classes/breakpad.bbclass
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/classes/breakpad.bbclass
rename to meta-openembedded/meta-oe/classes/breakpad.bbclass
diff --git a/import-layers/meta-openembedded/meta-oe/classes/dos2unix.bbclass b/meta-openembedded/meta-oe/classes/dos2unix.bbclass
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/classes/dos2unix.bbclass
rename to meta-openembedded/meta-oe/classes/dos2unix.bbclass
diff --git a/import-layers/meta-openembedded/meta-oe/classes/gitpkgv.bbclass b/meta-openembedded/meta-oe/classes/gitpkgv.bbclass
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/classes/gitpkgv.bbclass
rename to meta-openembedded/meta-oe/classes/gitpkgv.bbclass
diff --git a/import-layers/meta-openembedded/meta-oe/classes/gitver.bbclass b/meta-openembedded/meta-oe/classes/gitver.bbclass
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/classes/gitver.bbclass
rename to meta-openembedded/meta-oe/classes/gitver.bbclass
diff --git a/import-layers/meta-openembedded/meta-oe/classes/gpe.bbclass b/meta-openembedded/meta-oe/classes/gpe.bbclass
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/classes/gpe.bbclass
rename to meta-openembedded/meta-oe/classes/gpe.bbclass
diff --git a/import-layers/meta-openembedded/meta-oe/classes/machine_kernel_pr.bbclass b/meta-openembedded/meta-oe/classes/machine_kernel_pr.bbclass
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/classes/machine_kernel_pr.bbclass
rename to meta-openembedded/meta-oe/classes/machine_kernel_pr.bbclass
diff --git a/import-layers/meta-openembedded/meta-oe/classes/socorro-syms.bbclass b/meta-openembedded/meta-oe/classes/socorro-syms.bbclass
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/classes/socorro-syms.bbclass
rename to meta-openembedded/meta-oe/classes/socorro-syms.bbclass
diff --git a/import-layers/meta-openembedded/meta-oe/conf/layer.conf b/meta-openembedded/meta-oe/conf/layer.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/conf/layer.conf
rename to meta-openembedded/meta-oe/conf/layer.conf
diff --git a/import-layers/meta-openembedded/meta-oe/licenses/FLTK b/meta-openembedded/meta-oe/licenses/FLTK
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/licenses/FLTK
rename to meta-openembedded/meta-oe/licenses/FLTK
diff --git a/import-layers/meta-openembedded/meta-oe/licenses/GD b/meta-openembedded/meta-oe/licenses/GD
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/licenses/GD
rename to meta-openembedded/meta-oe/licenses/GD
diff --git a/import-layers/meta-openembedded/meta-oe/licenses/GPL-2.0-with-lmbench-restriction b/meta-openembedded/meta-oe/licenses/GPL-2.0-with-lmbench-restriction
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/licenses/GPL-2.0-with-lmbench-restriction
rename to meta-openembedded/meta-oe/licenses/GPL-2.0-with-lmbench-restriction
diff --git a/import-layers/meta-openembedded/meta-oe/licenses/ImageMagick b/meta-openembedded/meta-oe/licenses/ImageMagick
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/licenses/ImageMagick
rename to meta-openembedded/meta-oe/licenses/ImageMagick
diff --git a/import-layers/meta-openembedded/meta-oe/licenses/Kilgard b/meta-openembedded/meta-oe/licenses/Kilgard
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/licenses/Kilgard
rename to meta-openembedded/meta-oe/licenses/Kilgard
diff --git a/import-layers/meta-openembedded/meta-oe/licenses/ManishSingh b/meta-openembedded/meta-oe/licenses/ManishSingh
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/licenses/ManishSingh
rename to meta-openembedded/meta-oe/licenses/ManishSingh
diff --git a/import-layers/meta-openembedded/meta-oe/licenses/OGPL b/meta-openembedded/meta-oe/licenses/OGPL
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/licenses/OGPL
rename to meta-openembedded/meta-oe/licenses/OGPL
diff --git a/import-layers/meta-openembedded/meta-oe/licenses/OpenLDAP b/meta-openembedded/meta-oe/licenses/OpenLDAP
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/licenses/OpenLDAP
rename to meta-openembedded/meta-oe/licenses/OpenLDAP
diff --git a/import-layers/meta-openembedded/meta-oe/licenses/QWTv1.0 b/meta-openembedded/meta-oe/licenses/QWTv1.0
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/licenses/QWTv1.0
rename to meta-openembedded/meta-oe/licenses/QWTv1.0
diff --git a/import-layers/meta-openembedded/meta-oe/licenses/TLWG b/meta-openembedded/meta-oe/licenses/TLWG
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/licenses/TLWG
rename to meta-openembedded/meta-oe/licenses/TLWG
diff --git a/import-layers/meta-openembedded/meta-oe/licenses/UFL b/meta-openembedded/meta-oe/licenses/UFL
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/licenses/UFL
rename to meta-openembedded/meta-oe/licenses/UFL
diff --git a/import-layers/meta-openembedded/meta-oe/licenses/X11 b/meta-openembedded/meta-oe/licenses/X11
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/licenses/X11
rename to meta-openembedded/meta-oe/licenses/X11
diff --git a/import-layers/meta-openembedded/meta-oe/licenses/flite b/meta-openembedded/meta-oe/licenses/flite
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/licenses/flite
rename to meta-openembedded/meta-oe/licenses/flite
diff --git a/import-layers/meta-openembedded/meta-oe/licenses/gnuplot b/meta-openembedded/meta-oe/licenses/gnuplot
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/licenses/gnuplot
rename to meta-openembedded/meta-oe/licenses/gnuplot
diff --git a/import-layers/meta-openembedded/meta-oe/licenses/iozone3 b/meta-openembedded/meta-oe/licenses/iozone3
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/licenses/iozone3
rename to meta-openembedded/meta-oe/licenses/iozone3
diff --git a/import-layers/meta-openembedded/meta-oe/licenses/nbench-byte b/meta-openembedded/meta-oe/licenses/nbench-byte
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/licenses/nbench-byte
rename to meta-openembedded/meta-oe/licenses/nbench-byte
diff --git a/import-layers/meta-openembedded/meta-oe/licenses/unRAR b/meta-openembedded/meta-oe/licenses/unRAR
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/licenses/unRAR
rename to meta-openembedded/meta-oe/licenses/unRAR
diff --git a/import-layers/meta-openembedded/meta-oe/licenses/vim b/meta-openembedded/meta-oe/licenses/vim
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/licenses/vim
rename to meta-openembedded/meta-oe/licenses/vim
diff --git a/import-layers/meta-openembedded/meta-oe/licenses/zsh b/meta-openembedded/meta-oe/licenses/zsh
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/licenses/zsh
rename to meta-openembedded/meta-oe/licenses/zsh
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/analyze-suspend/analyze-suspend_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/analyze-suspend/analyze-suspend_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/analyze-suspend/analyze-suspend_git.bb
rename to meta-openembedded/meta-oe/recipes-benchmark/analyze-suspend/analyze-suspend_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/bonnie/bonnie++_1.03e.bb b/meta-openembedded/meta-oe/recipes-benchmark/bonnie/bonnie++_1.03e.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/bonnie/bonnie++_1.03e.bb
rename to meta-openembedded/meta-oe/recipes-benchmark/bonnie/bonnie++_1.03e.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/bonnie/files/gcc-4.3-fixes.patch b/meta-openembedded/meta-oe/recipes-benchmark/bonnie/files/gcc-4.3-fixes.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/bonnie/files/gcc-4.3-fixes.patch
rename to meta-openembedded/meta-oe/recipes-benchmark/bonnie/files/gcc-4.3-fixes.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-neon_20140626.bb b/meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-neon_20140626.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-neon_20140626.bb
rename to meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-neon_20140626.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/dbench/dbench_4.0.bb b/meta-openembedded/meta-oe/recipes-benchmark/dbench/dbench_4.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/dbench/dbench_4.0.bb
rename to meta-openembedded/meta-oe/recipes-benchmark/dbench/dbench_4.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/dbench/files/destdir.patch b/meta-openembedded/meta-oe/recipes-benchmark/dbench/files/destdir.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/dbench/files/destdir.patch
rename to meta-openembedded/meta-oe/recipes-benchmark/dbench/files/destdir.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/dbench/files/makefile.patch b/meta-openembedded/meta-oe/recipes-benchmark/dbench/files/makefile.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/dbench/files/makefile.patch
rename to meta-openembedded/meta-oe/recipes-benchmark/dbench/files/makefile.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/dhrystone/dhrystone-2.1/dhrystone.patch b/meta-openembedded/meta-oe/recipes-benchmark/dhrystone/dhrystone-2.1/dhrystone.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/dhrystone/dhrystone-2.1/dhrystone.patch
rename to meta-openembedded/meta-oe/recipes-benchmark/dhrystone/dhrystone-2.1/dhrystone.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb b/meta-openembedded/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb
rename to meta-openembedded/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_2.9.bb b/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_2.9.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_2.9.bb
rename to meta-openembedded/meta-oe/recipes-benchmark/fio/fio_2.9.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0001-Fix-clang-warnings.patch b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0001-Fix-clang-warnings.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0001-Fix-clang-warnings.patch
rename to meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0001-Fix-clang-warnings.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/Fix-configure-for-sqrt-check.patch b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/Fix-configure-for-sqrt-check.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/Fix-configure-for-sqrt-check.patch
rename to meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/Fix-configure-for-sqrt-check.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/build-Check-packages-to-be-used-by-the-enabled-flavo.patch b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/build-Check-packages-to-be-used-by-the-enabled-flavo.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/build-Check-packages-to-be-used-by-the-enabled-flavo.patch
rename to meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/build-Check-packages-to-be-used-by-the-enabled-flavo.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb
rename to meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3/copyright.txt b/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3/copyright.txt
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3/copyright.txt
rename to meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3/copyright.txt
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3/parallelism.patch b/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3/parallelism.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3/parallelism.patch
rename to meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3/parallelism.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_465.bb b/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_465.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_465.bb
rename to meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_465.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.10.bb b/meta-openembedded/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.10.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.10.bb
rename to meta-openembedded/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.10.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch b/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch
rename to meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/automake-foreign.patch b/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/automake-foreign.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/automake-foreign.patch
rename to meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/automake-foreign.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.2.bb b/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.2.bb
rename to meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/libc-bench/libc-bench_20110206.bb b/meta-openembedded/meta-oe/recipes-benchmark/libc-bench/libc-bench_20110206.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/libc-bench/libc-bench_20110206.bb
rename to meta-openembedded/meta-oe/recipes-benchmark/libc-bench/libc-bench_20110206.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch
rename to meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/Force-text-segment-alignment-to-0x08000000-for-i386-.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/Force-text-segment-alignment-to-0x08000000-for-i386-.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/Force-text-segment-alignment-to-0x08000000-for-i386-.patch
rename to meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/Force-text-segment-alignment-to-0x08000000-for-i386-.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-avoid-search-host-library-path-for-cros.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-avoid-search-host-library-path-for-cros.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-avoid-search-host-library-path-for-cros.patch
rename to meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-avoid-search-host-library-path-for-cros.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-elf_i386-avoid-search-host-library-path.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-elf_i386-avoid-search-host-library-path.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-elf_i386-avoid-search-host-library-path.patch
rename to meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-elf_i386-avoid-search-host-library-path.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch
rename to meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/tests-Makefile-install-static-4G-edge-testcases.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/tests-Makefile-install-static-4G-edge-testcases.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/tests-Makefile-install-static-4G-edge-testcases.patch
rename to meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/tests-Makefile-install-static-4G-edge-testcases.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
rename to meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/linpack/linpack_1.0.bb b/meta-openembedded/meta-oe/recipes-benchmark/linpack/linpack_1.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/linpack/linpack_1.0.bb
rename to meta-openembedded/meta-oe/recipes-benchmark/linpack/linpack_1.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-Check-for-musl-define-guard-before-redefining-sockle.patch b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-Check-for-musl-define-guard-before-redefining-sockle.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-Check-for-musl-define-guard-before-redefining-sockle.patch
rename to meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-Check-for-musl-define-guard-before-redefining-sockle.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-lat_http.c-Add-printf-format.patch b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-lat_http.c-Add-printf-format.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-lat_http.c-Add-printf-format.patch
rename to meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0001-lat_http.c-Add-printf-format.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0002-build-Adjust-CFLAGS-LDFLAGS-to-append-values-passed-.patch b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0002-build-Adjust-CFLAGS-LDFLAGS-to-append-values-passed-.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0002-build-Adjust-CFLAGS-LDFLAGS-to-append-values-passed-.patch
rename to meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/0002-build-Adjust-CFLAGS-LDFLAGS-to-append-values-passed-.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/fix-lmbench-memory-check-failure.patch b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/fix-lmbench-memory-check-failure.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/fix-lmbench-memory-check-failure.patch
rename to meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/fix-lmbench-memory-check-failure.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/lmbench_result_html_report.patch b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/lmbench_result_html_report.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/lmbench_result_html_report.patch
rename to meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/lmbench_result_html_report.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/obey-ranlib.patch b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/obey-ranlib.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/obey-ranlib.patch
rename to meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/obey-ranlib.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/update-config-script.patch b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/update-config-script.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/update-config-script.patch
rename to meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/update-config-script.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/update-results-script.patch b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/update-results-script.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/update-results-script.patch
rename to meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/update-results-script.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/use-base_libdir-instead-of-hardcoded-lib.patch b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/use-base_libdir-instead-of-hardcoded-lib.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/use-base_libdir-instead-of-hardcoded-lib.patch
rename to meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/use-base_libdir-instead-of-hardcoded-lib.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench/0001-avoid-gcc-optimize-away-the-loops.patch b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench/0001-avoid-gcc-optimize-away-the-loops.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench/0001-avoid-gcc-optimize-away-the-loops.patch
rename to meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench/0001-avoid-gcc-optimize-away-the-loops.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench/lmbench-run b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench/lmbench-run
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench/lmbench-run
rename to meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench/lmbench-run
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench/rename-line-binary.patch b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench/rename-line-binary.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench/rename-line-binary.patch
rename to meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench/rename-line-binary.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb
rename to meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/memtester/files/Makefile.patch b/meta-openembedded/meta-oe/recipes-benchmark/memtester/files/Makefile.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/memtester/files/Makefile.patch
rename to meta-openembedded/meta-oe/recipes-benchmark/memtester/files/Makefile.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.3.0.bb b/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.3.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.3.0.bb
rename to meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.3.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/nbench-byte/nbench-byte/Makefile-add-more-dependencies-to-pointer.h.patch b/meta-openembedded/meta-oe/recipes-benchmark/nbench-byte/nbench-byte/Makefile-add-more-dependencies-to-pointer.h.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/nbench-byte/nbench-byte/Makefile-add-more-dependencies-to-pointer.h.patch
rename to meta-openembedded/meta-oe/recipes-benchmark/nbench-byte/nbench-byte/Makefile-add-more-dependencies-to-pointer.h.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/nbench-byte/nbench-byte/nbench_32bits.patch b/meta-openembedded/meta-oe/recipes-benchmark/nbench-byte/nbench-byte/nbench_32bits.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/nbench-byte/nbench-byte/nbench_32bits.patch
rename to meta-openembedded/meta-oe/recipes-benchmark/nbench-byte/nbench-byte/nbench_32bits.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/nbench-byte/nbench-byte_2.2.3.bb b/meta-openembedded/meta-oe/recipes-benchmark/nbench-byte/nbench-byte_2.2.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/nbench-byte/nbench-byte_2.2.3.bb
rename to meta-openembedded/meta-oe/recipes-benchmark/nbench-byte/nbench-byte_2.2.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_7.8.0.bb b/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_7.8.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_7.8.0.bb
rename to meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_7.8.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/sysbench/sysbench_0.4.12.bb b/meta-openembedded/meta-oe/recipes-benchmark/sysbench/sysbench_0.4.12.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/sysbench/sysbench_0.4.12.bb
rename to meta-openembedded/meta-oe/recipes-benchmark/sysbench/sysbench_0.4.12.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/tinymembench/tinymembench_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/tinymembench/tinymembench_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/tinymembench/tinymembench_git.bb
rename to meta-openembedded/meta-oe/recipes-benchmark/tinymembench/tinymembench_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/tiobench/tiobench-0.3.3/0001-Drop-inline-of-crc32-function-to-fix-build-using-GCC.patch b/meta-openembedded/meta-oe/recipes-benchmark/tiobench/tiobench-0.3.3/0001-Drop-inline-of-crc32-function-to-fix-build-using-GCC.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/tiobench/tiobench-0.3.3/0001-Drop-inline-of-crc32-function-to-fix-build-using-GCC.patch
rename to meta-openembedded/meta-oe/recipes-benchmark/tiobench/tiobench-0.3.3/0001-Drop-inline-of-crc32-function-to-fix-build-using-GCC.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/tiobench/tiobench-0.3.3/0001-Specify-printf-formats.patch b/meta-openembedded/meta-oe/recipes-benchmark/tiobench/tiobench-0.3.3/0001-Specify-printf-formats.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/tiobench/tiobench-0.3.3/0001-Specify-printf-formats.patch
rename to meta-openembedded/meta-oe/recipes-benchmark/tiobench/tiobench-0.3.3/0001-Specify-printf-formats.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/tiobench/tiobench-0.3.3/avoid-glibc-clashes.patch b/meta-openembedded/meta-oe/recipes-benchmark/tiobench/tiobench-0.3.3/avoid-glibc-clashes.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/tiobench/tiobench-0.3.3/avoid-glibc-clashes.patch
rename to meta-openembedded/meta-oe/recipes-benchmark/tiobench/tiobench-0.3.3/avoid-glibc-clashes.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/tiobench/tiobench-0.3.3/tiobench-makefile.patch b/meta-openembedded/meta-oe/recipes-benchmark/tiobench/tiobench-0.3.3/tiobench-makefile.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/tiobench/tiobench-0.3.3/tiobench-makefile.patch
rename to meta-openembedded/meta-oe/recipes-benchmark/tiobench/tiobench-0.3.3/tiobench-makefile.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/tiobench/tiobench_0.3.3.bb b/meta-openembedded/meta-oe/recipes-benchmark/tiobench/tiobench_0.3.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/tiobench/tiobench_0.3.3.bb
rename to meta-openembedded/meta-oe/recipes-benchmark/tiobench/tiobench_0.3.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/whetstone/whetstone_1.2.bb b/meta-openembedded/meta-oe/recipes-benchmark/whetstone/whetstone_1.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/whetstone/whetstone_1.2.bb
rename to meta-openembedded/meta-oe/recipes-benchmark/whetstone/whetstone_1.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/acpitool/acpitool_0.5.1.bb b/meta-openembedded/meta-oe/recipes-bsp/acpitool/acpitool_0.5.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/acpitool/acpitool_0.5.1.bb
rename to meta-openembedded/meta-oe/recipes-bsp/acpitool/acpitool_0.5.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils/0001-dont-unset-cflags.patch b/meta-openembedded/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils/0001-dont-unset-cflags.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils/0001-dont-unset-cflags.patch
rename to meta-openembedded/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils/0001-dont-unset-cflags.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb b/meta-openembedded/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb
rename to meta-openembedded/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb b/meta-openembedded/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb
rename to meta-openembedded/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/edac-utils/files/add-restart-to-initscript.patch b/meta-openembedded/meta-oe/recipes-bsp/edac-utils/files/add-restart-to-initscript.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/edac-utils/files/add-restart-to-initscript.patch
rename to meta-openembedded/meta-oe/recipes-bsp/edac-utils/files/add-restart-to-initscript.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/edac-utils/files/edac.service b/meta-openembedded/meta-oe/recipes-bsp/edac-utils/files/edac.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/edac-utils/files/edac.service
rename to meta-openembedded/meta-oe/recipes-bsp/edac-utils/files/edac.service
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/edac-utils/files/make-init-script-be-able-to-automatically-load-EDAC-.patch b/meta-openembedded/meta-oe/recipes-bsp/edac-utils/files/make-init-script-be-able-to-automatically-load-EDAC-.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/edac-utils/files/make-init-script-be-able-to-automatically-load-EDAC-.patch
rename to meta-openembedded/meta-oe/recipes-bsp/edac-utils/files/make-init-script-be-able-to-automatically-load-EDAC-.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/efibootmgr/efibootmgr_0.15.bb b/meta-openembedded/meta-oe/recipes-bsp/efibootmgr/efibootmgr_0.15.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/efibootmgr/efibootmgr_0.15.bb
rename to meta-openembedded/meta-oe/recipes-bsp/efibootmgr/efibootmgr_0.15.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0001-efivar-dp.h-Add-Wunknown-attributes-when-using-clang.patch b/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0001-efivar-dp.h-Add-Wunknown-attributes-when-using-clang.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0001-efivar-dp.h-Add-Wunknown-attributes-when-using-clang.patch
rename to meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0001-efivar-dp.h-Add-Wunknown-attributes-when-using-clang.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0001-efivar-fix-for-cross-compile.patch b/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0001-efivar-fix-for-cross-compile.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0001-efivar-fix-for-cross-compile.patch
rename to meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0001-efivar-fix-for-cross-compile.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch b/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch
rename to meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0001-makeguids-Do-not-use-__bswap_constant_-16-32-macros.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0003-efivar-fix-for-cross-compile.patch b/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0003-efivar-fix-for-cross-compile.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0003-efivar-fix-for-cross-compile.patch
rename to meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0003-efivar-fix-for-cross-compile.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0004-fix-unknow-option-for-gold-linker.patch b/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0004-fix-unknow-option-for-gold-linker.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0004-fix-unknow-option-for-gold-linker.patch
rename to meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/0004-fix-unknow-option-for-gold-linker.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/allow-multi-definitions-for-native.patch b/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/allow-multi-definitions-for-native.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/allow-multi-definitions-for-native.patch
rename to meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/allow-multi-definitions-for-native.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/fix-compile-failure-with-host-gcc-4.6.patch b/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/fix-compile-failure-with-host-gcc-4.6.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/fix-compile-failure-with-host-gcc-4.6.patch
rename to meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/fix-compile-failure-with-host-gcc-4.6.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/musl-strndupa.patch b/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/musl-strndupa.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/musl-strndupa.patch
rename to meta-openembedded/meta-oe/recipes-bsp/efivar/efivar/musl-strndupa.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar_0.31.bb b/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar_0.31.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/efivar/efivar_0.31.bb
rename to meta-openembedded/meta-oe/recipes-bsp/efivar/efivar_0.31.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-platform-Add-riscv-to-known-platforms.patch b/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-platform-Add-riscv-to-known-platforms.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-platform-Add-riscv-to-known-platforms.patch
rename to meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-platform-Add-riscv-to-known-platforms.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/sst26.patch b/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/sst26.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/sst26.patch
rename to meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/sst26.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.0.bb b/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.0.bb
rename to meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config/fancontrol b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config/fancontrol
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config/fancontrol
rename to meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config/fancontrol
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config/sensord b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config/sensord
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config/sensord
rename to meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config/sensord
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config/sensord.cgi b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config/sensord.cgi
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config/sensord.cgi
rename to meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config/sensord.cgi
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config/sensord.conf b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config/sensord.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config/sensord.conf
rename to meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config/sensord.conf
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config/sensors.conf b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config/sensors.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config/sensors.conf
rename to meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config/sensors.conf
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb
rename to meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-lmsensors-sensors-detect-print-a-special-message-whe.patch b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-lmsensors-sensors-detect-print-a-special-message-whe.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-lmsensors-sensors-detect-print-a-special-message-whe.patch
rename to meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-lmsensors-sensors-detect-print-a-special-message-whe.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-prog-Do-not-limit-sys-io.h-header-include-to-just-gl.patch b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-prog-Do-not-limit-sys-io.h-header-include-to-just-gl.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-prog-Do-not-limit-sys-io.h-header-include-to-just-gl.patch
rename to meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/0001-prog-Do-not-limit-sys-io.h-header-include-to-just-gl.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/fancontrol.init b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/fancontrol.init
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/fancontrol.init
rename to meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/fancontrol.init
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/sensord.init b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/sensord.init
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/sensord.init
rename to meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors/sensord.init
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.4.0.bb b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.4.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.4.0.bb
rename to meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.4.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/lssci/lsscsi_0.28.bb b/meta-openembedded/meta-oe/recipes-bsp/lssci/lsscsi_0.28.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/lssci/lsscsi_0.28.bb
rename to meta-openembedded/meta-oe/recipes-bsp/lssci/lsscsi_0.28.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/COPYING b/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/COPYING
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/COPYING
rename to meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/COPYING
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/pointercal b/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/pointercal
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/pointercal
rename to meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/pointercal
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemuarm/pointercal b/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemuarm/pointercal
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemuarm/pointercal
rename to meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemuarm/pointercal
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemuarmv6/pointercal b/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemuarmv6/pointercal
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemuarmv6/pointercal
rename to meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemuarmv6/pointercal
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemuarmv7/pointercal b/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemuarmv7/pointercal
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemuarmv7/pointercal
rename to meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemuarmv7/pointercal
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemumips/pointercal b/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemumips/pointercal
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemumips/pointercal
rename to meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemumips/pointercal
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemuppc/pointercal b/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemuppc/pointercal
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemuppc/pointercal
rename to meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemuppc/pointercal
Binary files differ
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemux86-64/pointercal b/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemux86-64/pointercal
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemux86-64/pointercal
rename to meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemux86-64/pointercal
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemux86/pointercal b/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemux86/pointercal
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemux86/pointercal
rename to meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemux86/pointercal
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal_0.0.bb b/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal_0.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal_0.0.bb
rename to meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal_0.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/gammu/gammu/gammu-smsdrc b/meta-openembedded/meta-oe/recipes-connectivity/gammu/gammu/gammu-smsdrc
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/gammu/gammu/gammu-smsdrc
rename to meta-openembedded/meta-oe/recipes-connectivity/gammu/gammu/gammu-smsdrc
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/gammu/gammu/gammurc b/meta-openembedded/meta-oe/recipes-connectivity/gammu/gammu/gammurc
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/gammu/gammu/gammurc
rename to meta-openembedded/meta-oe/recipes-connectivity/gammu/gammu/gammurc
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/gammu/gammu_1.32.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/gammu/gammu_1.32.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/gammu/gammu_1.32.0.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/gammu/gammu_1.32.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch b/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch b/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch b/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0004-Prevent-installation-of-an-all-zero-TK.patch b/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0004-Prevent-installation-of-an-all-zero-TK.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0004-Prevent-installation-of-an-all-zero-TK.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0004-Prevent-installation-of-an-all-zero-TK.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch b/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0006-TDLS-Reject-TPK-TK-reconfiguration.patch b/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0006-TDLS-Reject-TPK-TK-reconfiguration.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0006-TDLS-Reject-TPK-TK-reconfiguration.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0006-TDLS-Reject-TPK-TK-reconfiguration.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0007-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch b/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0007-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0007-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0007-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/defconfig b/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/defconfig
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/defconfig
rename to meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/defconfig
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/hostapd.service b/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/hostapd.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/hostapd.service
rename to meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/hostapd.service
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/init b/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/init
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/init
rename to meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/init
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd_2.6.bb b/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd_2.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd_2.6.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd_2.6.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/irssi/irssi_1.0.4.bb b/meta-openembedded/meta-oe/recipes-connectivity/irssi/irssi_1.0.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/irssi/irssi_1.0.4.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/irssi/irssi_1.0.4.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/0001-aclocal-Add-parameter-to-disable-keyutils-detection.patch b/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/0001-aclocal-Add-parameter-to-disable-keyutils-detection.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/0001-aclocal-Add-parameter-to-disable-keyutils-detection.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/0001-aclocal-Add-parameter-to-disable-keyutils-detection.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/crosscompile_nm.patch b/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/crosscompile_nm.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/crosscompile_nm.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/crosscompile_nm.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/debian-suppress-usr-lib-in-krb5-config.patch b/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/debian-suppress-usr-lib-in-krb5-config.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/debian-suppress-usr-lib-in-krb5-config.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/debian-suppress-usr-lib-in-krb5-config.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/etc/default/krb5-admin-server b/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/etc/default/krb5-admin-server
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/etc/default/krb5-admin-server
rename to meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/etc/default/krb5-admin-server
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/etc/default/krb5-kdc b/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/etc/default/krb5-kdc
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/etc/default/krb5-kdc
rename to meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/etc/default/krb5-kdc
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/etc/init.d/krb5-admin-server b/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/etc/init.d/krb5-admin-server
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/etc/init.d/krb5-admin-server
rename to meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/etc/init.d/krb5-admin-server
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/etc/init.d/krb5-kdc b/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/etc/init.d/krb5-kdc
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/etc/init.d/krb5-kdc
rename to meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/etc/init.d/krb5-kdc
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/krb5-admin-server.service b/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/krb5-admin-server.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/krb5-admin-server.service
rename to meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/krb5-admin-server.service
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/krb5-kdc.service b/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/krb5-kdc.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/krb5-kdc.service
rename to meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/krb5-kdc.service
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.16.bb b/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.16.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.16.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.16.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libev/libev_4.24.bb b/meta-openembedded/meta-oe/recipes-connectivity/libev/libev_4.24.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/libev/libev_4.24.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/libev/libev_4.24.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/files/configure-fix-largefile.patch b/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/files/configure-fix-largefile.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/files/configure-fix-largefile.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/files/configure-fix-largefile.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/files/inline-without-definition.patch b/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/files/inline-without-definition.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/files/inline-without-definition.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/files/inline-without-definition.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.1.4.bb b/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.1.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.1.4.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_1.1.4.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim/clang.patch b/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim/clang.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim/clang.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim/clang.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.14.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.14.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.14.0.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.14.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libmtp/libmtp-1.1.5/69-libmtp.rules b/meta-openembedded/meta-oe/recipes-connectivity/libmtp/libmtp-1.1.5/69-libmtp.rules
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/libmtp/libmtp-1.1.5/69-libmtp.rules
rename to meta-openembedded/meta-oe/recipes-connectivity/libmtp/libmtp-1.1.5/69-libmtp.rules
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libmtp/libmtp-1.1.5/glibc-2.20.patch b/meta-openembedded/meta-oe/recipes-connectivity/libmtp/libmtp-1.1.5/glibc-2.20.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/libmtp/libmtp-1.1.5/glibc-2.20.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/libmtp/libmtp-1.1.5/glibc-2.20.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.5.bb b/meta-openembedded/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.5.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.5.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libndp/libndp/0001-include-sys-select.h-for-fd_-definitions.patch b/meta-openembedded/meta-oe/recipes-connectivity/libndp/libndp/0001-include-sys-select.h-for-fd_-definitions.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/libndp/libndp/0001-include-sys-select.h-for-fd_-definitions.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/libndp/libndp/0001-include-sys-select.h-for-fd_-definitions.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libndp/libndp_1.6.bb b/meta-openembedded/meta-oe/recipes-connectivity/libndp/libndp_1.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/libndp/libndp_1.6.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/libndp/libndp_1.6.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libnet/libnet/0001-Support-musl-libc-remove-support-for-glibc-2.1.patch b/meta-openembedded/meta-oe/recipes-connectivity/libnet/libnet/0001-Support-musl-libc-remove-support-for-glibc-2.1.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/libnet/libnet/0001-Support-musl-libc-remove-support-for-glibc-2.1.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/libnet/libnet/0001-Support-musl-libc-remove-support-for-glibc-2.1.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libnet/libnet_1.2-rc3.bb b/meta-openembedded/meta-oe/recipes-connectivity/libnet/libnet_1.2-rc3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/libnet/libnet_1.2-rc3.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/libnet/libnet_1.2-rc3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi/0001-Detect-clang.patch b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi/0001-Detect-clang.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi/0001-Detect-clang.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi/0001-Detect-clang.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.20.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.20.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.20.0.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.20.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent/0001-Define-64bit-atomic-helpers-for-ppc-32-bit.patch b/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent/0001-Define-64bit-atomic-helpers-for-ppc-32-bit.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent/0001-Define-64bit-atomic-helpers-for-ppc-32-bit.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent/0001-Define-64bit-atomic-helpers-for-ppc-32-bit.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent/0001-implement-64bit-atomic-for-mips.patch b/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent/0001-implement-64bit-atomic-for-mips.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent/0001-implement-64bit-atomic-for-mips.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent/0001-implement-64bit-atomic-for-mips.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent/don-t-run-code-while-configuring-package.patch b/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent/don-t-run-code-while-configuring-package.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent/don-t-run-code-while-configuring-package.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent/don-t-run-code-while-configuring-package.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libuv/libuv_1.11.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/libuv/libuv_1.11.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/libuv/libuv_1.11.0.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/libuv/libuv_1.11.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_2.1.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_2.1.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_2.1.0.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_2.1.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/0003-include-missing-time.h-for-time_t.patch b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/0003-include-missing-time.h-for-time_t.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/0003-include-missing-time.h-for-time_t.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/0003-include-missing-time.h-for-time_t.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/0004-Adjust-include-header-sequence-to-avoid-duplicate-de.patch b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/0004-Adjust-include-header-sequence-to-avoid-duplicate-de.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/0004-Adjust-include-header-sequence-to-avoid-duplicate-de.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/0004-Adjust-include-header-sequence-to-avoid-duplicate-de.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/build-Allow-CC-and-prefix-to-be-overriden.patch b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/build-Allow-CC-and-prefix-to-be-overriden.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/build-Allow-CC-and-prefix-to-be-overriden.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/build-Allow-CC-and-prefix-to-be-overriden.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/no-incdefs-using-host-headers.patch b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/no-incdefs-using-host-headers.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/no-incdefs-using-host-headers.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp/no-incdefs-using-host-headers.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_1.8.bb b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_1.8.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_1.8.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_1.8.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/lirc/lirc/lirc.tmpfiles b/meta-openembedded/meta-oe/recipes-connectivity/lirc/lirc/lirc.tmpfiles
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/lirc/lirc/lirc.tmpfiles
rename to meta-openembedded/meta-oe/recipes-connectivity/lirc/lirc/lirc.tmpfiles
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/lirc/lirc/lirc_options.conf b/meta-openembedded/meta-oe/recipes-connectivity/lirc/lirc/lirc_options.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/lirc/lirc/lirc_options.conf
rename to meta-openembedded/meta-oe/recipes-connectivity/lirc/lirc/lirc_options.conf
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/lirc/lirc/lircd.conf b/meta-openembedded/meta-oe/recipes-connectivity/lirc/lirc/lircd.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/lirc/lirc/lircd.conf
rename to meta-openembedded/meta-oe/recipes-connectivity/lirc/lirc/lircd.conf
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/lirc/lirc/lircd.init b/meta-openembedded/meta-oe/recipes-connectivity/lirc/lirc/lircd.init
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/lirc/lirc/lircd.init
rename to meta-openembedded/meta-oe/recipes-connectivity/lirc/lirc/lircd.init
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/lirc/lirc/lircd.service b/meta-openembedded/meta-oe/recipes-connectivity/lirc/lirc/lircd.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/lirc/lirc/lircd.service
rename to meta-openembedded/meta-oe/recipes-connectivity/lirc/lirc/lircd.service
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/lirc/lirc/lircexec.init b/meta-openembedded/meta-oe/recipes-connectivity/lirc/lirc/lircexec.init
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/lirc/lirc/lircexec.init
rename to meta-openembedded/meta-oe/recipes-connectivity/lirc/lirc/lircexec.init
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/lirc/lirc/pollfd.patch b/meta-openembedded/meta-oe/recipes-connectivity/lirc/lirc/pollfd.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/lirc/lirc/pollfd.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/lirc/lirc/pollfd.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/lirc/lirc_0.9.4d.bb b/meta-openembedded/meta-oe/recipes-connectivity/lirc/lirc_0.9.4d.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/lirc/lirc_0.9.4d.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/lirc/lirc_0.9.4d.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/loudmouth/loudmouth-1.4.3/04-use-pkg-config-for-gnutls.patch b/meta-openembedded/meta-oe/recipes-connectivity/loudmouth/loudmouth-1.4.3/04-use-pkg-config-for-gnutls.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/loudmouth/loudmouth-1.4.3/04-use-pkg-config-for-gnutls.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/loudmouth/loudmouth-1.4.3/04-use-pkg-config-for-gnutls.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/loudmouth/loudmouth-1.4.3/glib-2.32.patch b/meta-openembedded/meta-oe/recipes-connectivity/loudmouth/loudmouth-1.4.3/glib-2.32.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/loudmouth/loudmouth-1.4.3/glib-2.32.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/loudmouth/loudmouth-1.4.3/glib-2.32.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/loudmouth/loudmouth_1.4.3.bb b/meta-openembedded/meta-oe/recipes-connectivity/loudmouth/loudmouth_1.4.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/loudmouth/loudmouth_1.4.3.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/loudmouth/loudmouth_1.4.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager/enum-conversion.patch b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager/enum-conversion.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager/enum-conversion.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager/enum-conversion.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.6.4.bb b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.6.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.6.4.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.6.4.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh_1.3.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh_1.3.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh_1.3.0.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh_1.3.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/mosquitto/files/0001-config.mk-allow-prefix-mandir-localedir-from-environ.patch b/meta-openembedded/meta-oe/recipes-connectivity/mosquitto/files/0001-config.mk-allow-prefix-mandir-localedir-from-environ.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/mosquitto/files/0001-config.mk-allow-prefix-mandir-localedir-from-environ.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/mosquitto/files/0001-config.mk-allow-prefix-mandir-localedir-from-environ.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/mosquitto/files/0002-uthash-remove-in-tree-version.patch b/meta-openembedded/meta-oe/recipes-connectivity/mosquitto/files/0002-uthash-remove-in-tree-version.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/mosquitto/files/0002-uthash-remove-in-tree-version.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/mosquitto/files/0002-uthash-remove-in-tree-version.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/mosquitto/files/mosquitto.init b/meta-openembedded/meta-oe/recipes-connectivity/mosquitto/files/mosquitto.init
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/mosquitto/files/mosquitto.init
rename to meta-openembedded/meta-oe/recipes-connectivity/mosquitto/files/mosquitto.init
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/mosquitto/files/mosquitto.service b/meta-openembedded/meta-oe/recipes-connectivity/mosquitto/files/mosquitto.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/mosquitto/files/mosquitto.service
rename to meta-openembedded/meta-oe/recipes-connectivity/mosquitto/files/mosquitto.service
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/mosquitto/mosquitto_1.4.14.bb b/meta-openembedded/meta-oe/recipes-connectivity/mosquitto/mosquitto_1.4.14.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/mosquitto/mosquitto_1.4.14.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/mosquitto/mosquitto_1.4.14.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/obex/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch b/meta-openembedded/meta-oe/recipes-connectivity/obex/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/obex/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/obex/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb b/meta-openembedded/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/obexftp/obexftp/0001-apps-CMakeLists.txt-Explicitly-link-libbfb-and-libmu.patch b/meta-openembedded/meta-oe/recipes-connectivity/obexftp/obexftp/0001-apps-CMakeLists.txt-Explicitly-link-libbfb-and-libmu.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/obexftp/obexftp/0001-apps-CMakeLists.txt-Explicitly-link-libbfb-and-libmu.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/obexftp/obexftp/0001-apps-CMakeLists.txt-Explicitly-link-libbfb-and-libmu.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/obexftp/obexftp/Remove_some_printf_in_obexftpd.patch b/meta-openembedded/meta-oe/recipes-connectivity/obexftp/obexftp/Remove_some_printf_in_obexftpd.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/obexftp/obexftp/Remove_some_printf_in_obexftpd.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/obexftp/obexftp/Remove_some_printf_in_obexftpd.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/obexftp/obexftp/make_fuse_swig_optional.patch b/meta-openembedded/meta-oe/recipes-connectivity/obexftp/obexftp/make_fuse_swig_optional.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/obexftp/obexftp/make_fuse_swig_optional.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/obexftp/obexftp/make_fuse_swig_optional.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/packagegroups/packagegroup-tools-bluetooth.bb b/meta-openembedded/meta-oe/recipes-connectivity/packagegroups/packagegroup-tools-bluetooth.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/packagegroups/packagegroup-tools-bluetooth.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/packagegroups/packagegroup-tools-bluetooth.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/files/makefile.patch b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/files/makefile.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/files/makefile.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/files/makefile.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.2.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.2.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.2.0.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.2.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/phonet-utils/phonet-utils/0001-Include-limits.h-for-PATH_MAX.patch b/meta-openembedded/meta-oe/recipes-connectivity/phonet-utils/phonet-utils/0001-Include-limits.h-for-PATH_MAX.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/phonet-utils/phonet-utils/0001-Include-limits.h-for-PATH_MAX.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/phonet-utils/phonet-utils/0001-Include-limits.h-for-PATH_MAX.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/phonet-utils/phonet-utils_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/phonet-utils/phonet-utils_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/phonet-utils/phonet-utils_git.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/phonet-utils/phonet-utils_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.7.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.7.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.7.0.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.7.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/rfkill/rfkill/0001-rfkill-makefile-don-t-use-t-the-OE-install-wrapper-d.patch b/meta-openembedded/meta-oe/recipes-connectivity/rfkill/rfkill/0001-rfkill-makefile-don-t-use-t-the-OE-install-wrapper-d.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/rfkill/rfkill/0001-rfkill-makefile-don-t-use-t-the-OE-install-wrapper-d.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/rfkill/rfkill/0001-rfkill-makefile-don-t-use-t-the-OE-install-wrapper-d.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/rfkill/rfkill/dont.call.git.rev-parse.on.parent.dir.patch b/meta-openembedded/meta-oe/recipes-connectivity/rfkill/rfkill/dont.call.git.rev-parse.on.parent.dir.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/rfkill/rfkill/dont.call.git.rev-parse.on.parent.dir.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/rfkill/rfkill/dont.call.git.rev-parse.on.parent.dir.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/rfkill/rfkill_0.5.bb b/meta-openembedded/meta-oe/recipes-connectivity/rfkill/rfkill_0.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/rfkill/rfkill_0.5.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/rfkill/rfkill_0.5.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent/don-t-run-code-while-configuring-package.patch b/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent/don-t-run-code-while-configuring-package.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent/don-t-run-code-while-configuring-package.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent/don-t-run-code-while-configuring-package.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_3.4.bb b/meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_3.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_3.4.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_3.4.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/smstools3/smstools3/scripts_no_bash.patch b/meta-openembedded/meta-oe/recipes-connectivity/smstools3/smstools3/scripts_no_bash.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/smstools3/smstools3/scripts_no_bash.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/smstools3/smstools3/scripts_no_bash.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath.patch b/meta-openembedded/meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/smstools3/smstools3/sms_binpath.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.21.bb b/meta-openembedded/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.21.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.21.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.21.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.0.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/telepathy/telepathy-idle/fix-svc-gtk-doc.h-target.patch b/meta-openembedded/meta-oe/recipes-connectivity/telepathy/telepathy-idle/fix-svc-gtk-doc.h-target.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/telepathy/telepathy-idle/fix-svc-gtk-doc.h-target.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/telepathy/telepathy-idle/fix-svc-gtk-doc.h-target.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift-0.9.3/0001-Forcibly-disable-check-for-Qt5.patch b/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift-0.9.3/0001-Forcibly-disable-check-for-Qt5.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift-0.9.3/0001-Forcibly-disable-check-for-Qt5.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift-0.9.3/0001-Forcibly-disable-check-for-Qt5.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift-0.9.3/0001-THRIFT-3828-In-cmake-avoid-use-of-both-quoted-paths-.patch b/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift-0.9.3/0001-THRIFT-3828-In-cmake-avoid-use-of-both-quoted-paths-.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift-0.9.3/0001-THRIFT-3828-In-cmake-avoid-use-of-both-quoted-paths-.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift-0.9.3/0001-THRIFT-3828-In-cmake-avoid-use-of-both-quoted-paths-.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift-0.9.3/0002-THRIFT-3831-in-test-cpp-explicitly-use-signed-char.patch b/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift-0.9.3/0002-THRIFT-3831-in-test-cpp-explicitly-use-signed-char.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift-0.9.3/0002-THRIFT-3831-in-test-cpp-explicitly-use-signed-char.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift-0.9.3/0002-THRIFT-3831-in-test-cpp-explicitly-use-signed-char.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift_0.9.3.bb b/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift_0.9.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift_0.9.3.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift_0.9.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/umip/files/0001-Add-format-string-to-fprintf-call.patch b/meta-openembedded/meta-oe/recipes-connectivity/umip/files/0001-Add-format-string-to-fprintf-call.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/umip/files/0001-Add-format-string-to-fprintf-call.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/umip/files/0001-Add-format-string-to-fprintf-call.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/umip/files/0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch b/meta-openembedded/meta-oe/recipes-connectivity/umip/files/0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/umip/files/0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/umip/files/0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/umip/files/0002-replace-PTHREAD_MUTEX_FAST_NP-with-PTHREAD_MUTEX_NOR.patch b/meta-openembedded/meta-oe/recipes-connectivity/umip/files/0002-replace-PTHREAD_MUTEX_FAST_NP-with-PTHREAD_MUTEX_NOR.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/umip/files/0002-replace-PTHREAD_MUTEX_FAST_NP-with-PTHREAD_MUTEX_NOR.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/umip/files/0002-replace-PTHREAD_MUTEX_FAST_NP-with-PTHREAD_MUTEX_NOR.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/umip/files/add-dependency-to-support-parallel-compilation.patch b/meta-openembedded/meta-oe/recipes-connectivity/umip/files/add-dependency-to-support-parallel-compilation.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/umip/files/add-dependency-to-support-parallel-compilation.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/umip/files/add-dependency-to-support-parallel-compilation.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/umip/files/mip6d b/meta-openembedded/meta-oe/recipes-connectivity/umip/files/mip6d
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/umip/files/mip6d
rename to meta-openembedded/meta-oe/recipes-connectivity/umip/files/mip6d
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/umip/files/mip6d.service b/meta-openembedded/meta-oe/recipes-connectivity/umip/files/mip6d.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/umip/files/mip6d.service
rename to meta-openembedded/meta-oe/recipes-connectivity/umip/files/mip6d.service
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/umip/umip_1.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/umip/umip_1.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/umip/umip_1.0.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/umip/umip_1.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvdial/typo_pon.wvdial.1.patch b/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvdial/typo_pon.wvdial.1.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvdial/typo_pon.wvdial.1.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvdial/typo_pon.wvdial.1.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb b/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/0001-Check-for-limits.h-during-configure.patch b/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/0001-Check-for-limits.h-during-configure.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/0001-Check-for-limits.h-during-configure.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/0001-Check-for-limits.h-during-configure.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/0001-build-fix-parallel-make.patch b/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/0001-build-fix-parallel-make.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/0001-build-fix-parallel-make.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/0001-build-fix-parallel-make.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/0002-wvrules.mk-Use-_DEFAULT_SOURCE.patch b/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/0002-wvrules.mk-Use-_DEFAULT_SOURCE.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/0002-wvrules.mk-Use-_DEFAULT_SOURCE.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/0002-wvrules.mk-Use-_DEFAULT_SOURCE.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/0002-wvtask-Dont-use-ucontext-on-non-glibc-systems.patch b/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/0002-wvtask-Dont-use-ucontext-on-non-glibc-systems.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/0002-wvtask-Dont-use-ucontext-on-non-glibc-systems.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/0002-wvtask-Dont-use-ucontext-on-non-glibc-systems.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/0003-wvtask-Check-for-HAVE_LIBC_STACK_END-only-on-glibc-s.patch b/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/0003-wvtask-Check-for-HAVE_LIBC_STACK_END-only-on-glibc-s.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/0003-wvtask-Check-for-HAVE_LIBC_STACK_END-only-on-glibc-s.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/0003-wvtask-Check-for-HAVE_LIBC_STACK_END-only-on-glibc-s.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/0004-wvcrash-Replace-use-of-basename-API.patch b/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/0004-wvcrash-Replace-use-of-basename-API.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/0004-wvcrash-Replace-use-of-basename-API.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/0004-wvcrash-Replace-use-of-basename-API.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/0005-check-for-libexecinfo-during-configure.patch b/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/0005-check-for-libexecinfo-during-configure.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/0005-check-for-libexecinfo-during-configure.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/0005-check-for-libexecinfo-during-configure.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/04_signed_request.diff b/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/04_signed_request.diff
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/04_signed_request.diff
rename to meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/04_signed_request.diff
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/05_gcc.diff b/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/05_gcc.diff
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/05_gcc.diff
rename to meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/05_gcc.diff
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/06_gcc-4.7.diff b/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/06_gcc-4.7.diff
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/06_gcc-4.7.diff
rename to meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/06_gcc-4.7.diff
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/07_buildflags.diff b/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/07_buildflags.diff
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/07_buildflags.diff
rename to meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/07_buildflags.diff
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/argp.patch b/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/argp.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/argp.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/argp.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/gcc-6.patch b/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/gcc-6.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/gcc-6.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams/gcc-6.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix/0001-Fix-configure.ac.patch b/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix/0001-Fix-configure.ac.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix/0001-Fix-configure.ac.patch
rename to meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix/0001-Fix-configure.ac.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix/zabbix-agent.service b/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix/zabbix-agent.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix/zabbix-agent.service
rename to meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix/zabbix-agent.service
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_3.0.9.bb b/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_3.0.9.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_3.0.9.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_3.0.9.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/zeromq/files/run-ptest b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/files/run-ptest
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/zeromq/files/run-ptest
rename to meta-openembedded/meta-oe/recipes-connectivity/zeromq/files/run-ptest
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.2.5.bb b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.2.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.2.5.bb
rename to meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.2.5.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0001-Comment-rst2man-related-stuff.patch b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0001-Comment-rst2man-related-stuff.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0001-Comment-rst2man-related-stuff.patch
rename to meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0001-Comment-rst2man-related-stuff.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0002-Correct-including-directory-for-conf.patch b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0002-Correct-including-directory-for-conf.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0002-Correct-including-directory-for-conf.patch
rename to meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker/0002-Correct-including-directory-for-conf.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_git.bb b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_git.bb
rename to meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/dbus/dbus-daemon-proxy/0001-dbus-daemon-proxy-Return-DBUS_HANDLER_RESULT_NOT_YET.patch b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-daemon-proxy/0001-dbus-daemon-proxy-Return-DBUS_HANDLER_RESULT_NOT_YET.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-core/dbus/dbus-daemon-proxy/0001-dbus-daemon-proxy-Return-DBUS_HANDLER_RESULT_NOT_YET.patch
rename to meta-openembedded/meta-oe/recipes-core/dbus/dbus-daemon-proxy/0001-dbus-daemon-proxy-Return-DBUS_HANDLER_RESULT_NOT_YET.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb
rename to meta-openembedded/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/0001-pipe.c-Use-a-string-instead-of-char.patch b/meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/0001-pipe.c-Use-a-string-instead-of-char.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/0001-pipe.c-Use-a-string-instead-of-char.patch
rename to meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/0001-pipe.c-Use-a-string-instead-of-char.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/0001-src-eventloop.cpp-use-portable-method-for-initializi.patch b/meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/0001-src-eventloop.cpp-use-portable-method-for-initializi.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/0001-src-eventloop.cpp-use-portable-method-for-initializi.patch
rename to meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/0001-src-eventloop.cpp-use-portable-method-for-initializi.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/0002-tools-generate_proxy.cpp-avoid-possibly-undefined-ui.patch b/meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/0002-tools-generate_proxy.cpp-avoid-possibly-undefined-ui.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/0002-tools-generate_proxy.cpp-avoid-possibly-undefined-ui.patch
rename to meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/0002-tools-generate_proxy.cpp-avoid-possibly-undefined-ui.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/0003-Fixed-undefined-ssize_t-for-clang-3.8.0-on-FreeBSD.patch b/meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/0003-Fixed-undefined-ssize_t-for-clang-3.8.0-on-FreeBSD.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/0003-Fixed-undefined-ssize_t-for-clang-3.8.0-on-FreeBSD.patch
rename to meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/0003-Fixed-undefined-ssize_t-for-clang-3.8.0-on-FreeBSD.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/0004-use-POSIX-poll.h-instead-of-sys-poll.h.patch b/meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/0004-use-POSIX-poll.h-instead-of-sys-poll.h.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/0004-use-POSIX-poll.h-instead-of-sys-poll.h.patch
rename to meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/0004-use-POSIX-poll.h-instead-of-sys-poll.h.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/fix-missing-unistd.h-include.patch b/meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/fix-missing-unistd.h-include.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/fix-missing-unistd.h-include.patch
rename to meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/fix-missing-unistd.h-include.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/remove-CXX_FOR_BUILD-stuff.patch b/meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/remove-CXX_FOR_BUILD-stuff.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/remove-CXX_FOR_BUILD-stuff.patch
rename to meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++-0.9.0/remove-CXX_FOR_BUILD-stuff.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++_0.9.0.bb b/meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++_0.9.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++_0.9.0.bb
rename to meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++_0.9.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/eggdbus/eggdbus/gtk-doc.patch b/meta-openembedded/meta-oe/recipes-core/eggdbus/eggdbus/gtk-doc.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-core/eggdbus/eggdbus/gtk-doc.patch
rename to meta-openembedded/meta-oe/recipes-core/eggdbus/eggdbus/gtk-doc.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/eggdbus/eggdbus/marshal.patch b/meta-openembedded/meta-oe/recipes-core/eggdbus/eggdbus/marshal.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-core/eggdbus/eggdbus/marshal.patch
rename to meta-openembedded/meta-oe/recipes-core/eggdbus/eggdbus/marshal.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/eggdbus/eggdbus_0.6.bb b/meta-openembedded/meta-oe/recipes-core/eggdbus/eggdbus_0.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-core/eggdbus/eggdbus_0.6.bb
rename to meta-openembedded/meta-oe/recipes-core/eggdbus/eggdbus_0.6.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/ell/ell/0001-ell-fix-build-with-musl-libc.patch b/meta-openembedded/meta-oe/recipes-core/ell/ell/0001-ell-fix-build-with-musl-libc.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-core/ell/ell/0001-ell-fix-build-with-musl-libc.patch
rename to meta-openembedded/meta-oe/recipes-core/ell/ell/0001-ell-fix-build-with-musl-libc.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/ell/ell_0.4.bb b/meta-openembedded/meta-oe/recipes-core/ell/ell_0.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-core/ell/ell_0.4.bb
rename to meta-openembedded/meta-oe/recipes-core/ell/ell_0.4.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm/0001-Glib-Threads-Private-Fix-gobj.patch b/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm/0001-Glib-Threads-Private-Fix-gobj.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm/0001-Glib-Threads-Private-Fix-gobj.patch
rename to meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm/0001-Glib-Threads-Private-Fix-gobj.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm/remove-examples.patch b/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm/remove-examples.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm/remove-examples.patch
rename to meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm/remove-examples.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.54.1.bb b/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.54.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.54.1.bb
rename to meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.54.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.0.bb b/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.0.bb
rename to meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/libxml/libxml++/libxml++_ptest.patch b/meta-openembedded/meta-oe/recipes-core/libxml/libxml++/libxml++_ptest.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-core/libxml/libxml++/libxml++_ptest.patch
rename to meta-openembedded/meta-oe/recipes-core/libxml/libxml++/libxml++_ptest.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/libxml/libxml++/run-ptest b/meta-openembedded/meta-oe/recipes-core/libxml/libxml++/run-ptest
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-core/libxml/libxml++/run-ptest
rename to meta-openembedded/meta-oe/recipes-core/libxml/libxml++/run-ptest
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/libxml/libxml++_2.40.1.bb b/meta-openembedded/meta-oe/recipes-core/libxml/libxml++_2.40.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-core/libxml/libxml++_2.40.1.bb
rename to meta-openembedded/meta-oe/recipes-core/libxml/libxml++_2.40.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/meta/distro-feed-configs.bb b/meta-openembedded/meta-oe/recipes-core/meta/distro-feed-configs.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-core/meta/distro-feed-configs.bb
rename to meta-openembedded/meta-oe/recipes-core/meta/distro-feed-configs.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_0.9.11.bb b/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_0.9.11.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_0.9.11.bb
rename to meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_0.9.11.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
rename to meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb
rename to meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/plymouth/files/0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch b/meta-openembedded/meta-oe/recipes-core/plymouth/files/0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-core/plymouth/files/0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch
rename to meta-openembedded/meta-oe/recipes-core/plymouth/files/0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb b/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb
rename to meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb b/meta-openembedded/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb
rename to meta-openembedded/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.7.5.bb b/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.7.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.7.5.bb
rename to meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.7.5.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/usleep/files/GPLv2.patch b/meta-openembedded/meta-oe/recipes-core/usleep/files/GPLv2.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-core/usleep/files/GPLv2.patch
rename to meta-openembedded/meta-oe/recipes-core/usleep/files/GPLv2.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/usleep/files/usleep.1 b/meta-openembedded/meta-oe/recipes-core/usleep/files/usleep.1
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-core/usleep/files/usleep.1
rename to meta-openembedded/meta-oe/recipes-core/usleep/files/usleep.1
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/usleep/files/usleep.c b/meta-openembedded/meta-oe/recipes-core/usleep/files/usleep.c
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-core/usleep/files/usleep.c
rename to meta-openembedded/meta-oe/recipes-core/usleep/files/usleep.c
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/usleep/usleep_1.0.bb b/meta-openembedded/meta-oe/recipes-core/usleep/usleep_1.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-core/usleep/usleep_1.0.bb
rename to meta-openembedded/meta-oe/recipes-core/usleep/usleep_1.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_1.7.4.bb b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_1.7.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_1.7.4.bb
rename to meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_1.7.4.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-crypto/engine-pkcs11/engine-pkcs11_0.2.2.bb b/meta-openembedded/meta-oe/recipes-crypto/engine-pkcs11/engine-pkcs11_0.2.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-crypto/engine-pkcs11/engine-pkcs11_0.2.2.bb
rename to meta-openembedded/meta-oe/recipes-crypto/engine-pkcs11/engine-pkcs11_0.2.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb b/meta-openembedded/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb
rename to meta-openembedded/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-crypto/libsodium/libsodium_1.0.11.bb b/meta-openembedded/meta-oe/recipes-crypto/libsodium/libsodium_1.0.11.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-crypto/libsodium/libsodium_1.0.11.bb
rename to meta-openembedded/meta-oe/recipes-crypto/libsodium/libsodium_1.0.11.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.11.bb b/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.11.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.11.bb
rename to meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.11.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb/0001-Makefile-Fix-parallel-build.patch b/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb/0001-Makefile-Fix-parallel-build.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb/0001-Makefile-Fix-parallel-build.patch
rename to meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb/0001-Makefile-Fix-parallel-build.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb/0001-build_detect_platform-Check-for-__SSE4_2__.patch b/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb/0001-build_detect_platform-Check-for-__SSE4_2__.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb/0001-build_detect_platform-Check-for-__SSE4_2__.patch
rename to meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb/0001-build_detect_platform-Check-for-__SSE4_2__.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb/0002-makefile-build-SHARED_MEMENVLIB.patch b/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb/0002-makefile-build-SHARED_MEMENVLIB.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb/0002-makefile-build-SHARED_MEMENVLIB.patch
rename to meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb/0002-makefile-build-SHARED_MEMENVLIB.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb_git.bb b/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb_git.bb
rename to meta-openembedded/meta-oe/recipes-dbs/leveldb/leveldb_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/libdbi/libdbi.inc b/meta-openembedded/meta-oe/recipes-dbs/libdbi/libdbi.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/libdbi/libdbi.inc
rename to meta-openembedded/meta-oe/recipes-dbs/libdbi/libdbi.inc
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/libdbi/libdbi_0.9.0.bb b/meta-openembedded/meta-oe/recipes-dbs/libdbi/libdbi_0.9.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/libdbi/libdbi_0.9.0.bb
rename to meta-openembedded/meta-oe/recipes-dbs/libdbi/libdbi_0.9.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch
rename to meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-IntelRDFPMathLib20U1-Check-for-__DEFINED_wchar_t.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch
rename to meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Tell-scons-to-use-build-settings-from-environment-va.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch
rename to meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-__GLIBC__-to-control-use-of-gnu_get_libc_version.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch
rename to meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-long-long-instead-of-int64_t.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-strerror_r-only-on-glibc-systems.patch b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-strerror_r-only-on-glibc-systems.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-strerror_r-only-on-glibc-systems.patch
rename to meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0001-Use-strerror_r-only-on-glibc-systems.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0002-Add-a-definition-for-the-macro-__ELF_NATIVE_CLASS.patch b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0002-Add-a-definition-for-the-macro-__ELF_NATIVE_CLASS.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0002-Add-a-definition-for-the-macro-__ELF_NATIVE_CLASS.patch
rename to meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0002-Add-a-definition-for-the-macro-__ELF_NATIVE_CLASS.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0002-d_state.cpp-Add-missing-dependenncy-on-local_shardin.patch b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0002-d_state.cpp-Add-missing-dependenncy-on-local_shardin.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0002-d_state.cpp-Add-missing-dependenncy-on-local_shardin.patch
rename to meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0002-d_state.cpp-Add-missing-dependenncy-on-local_shardin.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0003-Conditionalize-glibc-specific-strerror_r.patch b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0003-Conditionalize-glibc-specific-strerror_r.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0003-Conditionalize-glibc-specific-strerror_r.patch
rename to meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0003-Conditionalize-glibc-specific-strerror_r.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0004-wiredtiger-Disable-strtouq-on-musl.patch b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0004-wiredtiger-Disable-strtouq-on-musl.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0004-wiredtiger-Disable-strtouq-on-musl.patch
rename to meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/0004-wiredtiger-Disable-strtouq-on-musl.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/arm64-support.patch b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/arm64-support.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/arm64-support.patch
rename to meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/arm64-support.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/disable-hw-crc32-on-arm64-s390x.patch b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/disable-hw-crc32-on-arm64-s390x.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/disable-hw-crc32-on-arm64-s390x.patch
rename to meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb/disable-hw-crc32-on-arm64-s390x.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb_git.bb b/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb_git.bb
rename to meta-openembedded/meta-oe/recipes-dbs/mongodb/mongodb_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_5.5.59.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_5.5.59.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_5.5.59.bb
rename to meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_5.5.59.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc
rename to meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-disable-ucontext-on-musl.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-disable-ucontext-on-musl.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-disable-ucontext-on-musl.patch
rename to meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-disable-ucontext-on-musl.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/change-cc-to-cc-version.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/change-cc-to-cc-version.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/change-cc-to-cc-version.patch
rename to meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/change-cc-to-cc-version.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/configure.cmake-fix-valgrind.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/configure.cmake-fix-valgrind.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/configure.cmake-fix-valgrind.patch
rename to meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/configure.cmake-fix-valgrind.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch
rename to meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/fix-cmake-module-path.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/fix-cmake-module-path.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/fix-cmake-module-path.patch
rename to meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/fix-cmake-module-path.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/fix-mysqlclient-r-version.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/fix-mysqlclient-r-version.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/fix-mysqlclient-r-version.patch
rename to meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/fix-mysqlclient-r-version.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/install_db b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/install_db
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/install_db
rename to meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/install_db
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/install_db.service b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/install_db.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/install_db.service
rename to meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/install_db.service
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/my.cnf b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/my.cnf
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/my.cnf
rename to meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/my.cnf
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/mysql-systemd-start b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/mysql-systemd-start
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/mysql-systemd-start
rename to meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/mysql-systemd-start
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/mysqld.service b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/mysqld.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/mysqld.service
rename to meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/mysqld.service
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/remove-bad-path.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/remove-bad-path.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/remove-bad-path.patch
rename to meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/remove-bad-path.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_5.5.59.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_5.5.59.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_5.5.59.bb
rename to meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_5.5.59.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb
rename to meta-openembedded/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch
rename to meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0001-Use-pkg-config-for-libxml2-detection.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch
rename to meta-openembedded/meta-oe/recipes-dbs/postgresql/files/not-check-libperl.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/postgresql-bashprofile b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/postgresql-bashprofile
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/postgresql-bashprofile
rename to meta-openembedded/meta-oe/recipes-dbs/postgresql/files/postgresql-bashprofile
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/postgresql-setup b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/postgresql-setup
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/postgresql-setup
rename to meta-openembedded/meta-oe/recipes-dbs/postgresql/files/postgresql-setup
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/postgresql.init b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/postgresql.init
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/postgresql.init
rename to meta-openembedded/meta-oe/recipes-dbs/postgresql/files/postgresql.init
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/postgresql.pam b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/postgresql.pam
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/postgresql.pam
rename to meta-openembedded/meta-oe/recipes-dbs/postgresql/files/postgresql.pam
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/postgresql.service b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/postgresql.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/postgresql.service
rename to meta-openembedded/meta-oe/recipes-dbs/postgresql/files/postgresql.service
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc
rename to meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_9.4.17.bb b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_9.4.17.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_9.4.17.bb
rename to meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_9.4.17.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-donot-use-the-hardcode-libdir.patch b/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-donot-use-the-hardcode-libdir.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-donot-use-the-hardcode-libdir.patch
rename to meta-openembedded/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-donot-use-the-hardcode-libdir.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-fix-for-ptest-support.patch b/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-fix-for-ptest-support.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-fix-for-ptest-support.patch
rename to meta-openembedded/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-fix-for-ptest-support.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-remove-some-checks-for-cross-compiling.patch b/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-remove-some-checks-for-cross-compiling.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-remove-some-checks-for-cross-compiling.patch
rename to meta-openembedded/meta-oe/recipes-dbs/psqlodbc/files/psqlodbc-remove-some-checks-for-cross-compiling.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/files/run-ptest b/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/files/run-ptest
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/files/run-ptest
rename to meta-openembedded/meta-oe/recipes-dbs/psqlodbc/files/run-ptest
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/psqlodbc.inc b/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/psqlodbc.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/psqlodbc.inc
rename to meta-openembedded/meta-oe/recipes-dbs/psqlodbc/psqlodbc.inc
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/psqlodbc_09.05.0300.bb b/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/psqlodbc_09.05.0300.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/psqlodbc/psqlodbc_09.05.0300.bb
rename to meta-openembedded/meta-oe/recipes-dbs/psqlodbc/psqlodbc_09.05.0300.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb
rename to meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/soci/soci/soci_libdir.patch b/meta-openembedded/meta-oe/recipes-dbs/soci/soci/soci_libdir.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/soci/soci/soci_libdir.patch
rename to meta-openembedded/meta-oe/recipes-dbs/soci/soci/soci_libdir.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/soci/soci_3.2.3.bb b/meta-openembedded/meta-oe/recipes-dbs/soci/soci_3.2.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/soci/soci_3.2.3.bb
rename to meta-openembedded/meta-oe/recipes-dbs/soci/soci_3.2.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/sqlite/sqlite-2.8.17/0001-shell.c-Fix-format-not-a-string-literal-warning.patch b/meta-openembedded/meta-oe/recipes-dbs/sqlite/sqlite-2.8.17/0001-shell.c-Fix-format-not-a-string-literal-warning.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/sqlite/sqlite-2.8.17/0001-shell.c-Fix-format-not-a-string-literal-warning.patch
rename to meta-openembedded/meta-oe/recipes-dbs/sqlite/sqlite-2.8.17/0001-shell.c-Fix-format-not-a-string-literal-warning.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/sqlite/sqlite-2.8.17/mainmk_build_dynamic.patch b/meta-openembedded/meta-oe/recipes-dbs/sqlite/sqlite-2.8.17/mainmk_build_dynamic.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/sqlite/sqlite-2.8.17/mainmk_build_dynamic.patch
rename to meta-openembedded/meta-oe/recipes-dbs/sqlite/sqlite-2.8.17/mainmk_build_dynamic.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/sqlite/sqlite-2.8.17/mainmk_no_tcl.patch b/meta-openembedded/meta-oe/recipes-dbs/sqlite/sqlite-2.8.17/mainmk_no_tcl.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/sqlite/sqlite-2.8.17/mainmk_no_tcl.patch
rename to meta-openembedded/meta-oe/recipes-dbs/sqlite/sqlite-2.8.17/mainmk_no_tcl.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/sqlite/sqlite-2.8.17/sqlite.pc b/meta-openembedded/meta-oe/recipes-dbs/sqlite/sqlite-2.8.17/sqlite.pc
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/sqlite/sqlite-2.8.17/sqlite.pc
rename to meta-openembedded/meta-oe/recipes-dbs/sqlite/sqlite-2.8.17/sqlite.pc
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-dbs/sqlite/sqlite_2.8.17.bb b/meta-openembedded/meta-oe/recipes-dbs/sqlite/sqlite_2.8.17.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-dbs/sqlite/sqlite_2.8.17.bb
rename to meta-openembedded/meta-oe/recipes-dbs/sqlite/sqlite_2.8.17.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf/android-gadget-setup b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf/android-gadget-setup
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf/android-gadget-setup
rename to meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf/android-gadget-setup
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb
rename to meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/.gitignore b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/.gitignore
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/.gitignore
rename to meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/.gitignore
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/0001-add-base64-implementation.patch b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/0001-add-base64-implementation.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/0001-add-base64-implementation.patch
rename to meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/0001-add-base64-implementation.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/0002-adb-Musl-fixes.patch b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/0002-adb-Musl-fixes.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/0002-adb-Musl-fixes.patch
rename to meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/0002-adb-Musl-fixes.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/adb.mk b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/adb.mk
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/adb.mk
rename to meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/adb.mk
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/adbd.mk b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/adbd.mk
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/adbd.mk
rename to meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/adbd.mk
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service
rename to meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/define-shell-command.patch b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/define-shell-command.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/define-shell-command.patch
rename to meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/define-shell-command.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/ext4_utils.mk b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/ext4_utils.mk
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/ext4_utils.mk
rename to meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/ext4_utils.mk
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/fastboot.mk b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/fastboot.mk
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/fastboot.mk
rename to meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/fastboot.mk
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/fix-big-endian-build.patch b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/fix-big-endian-build.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/fix-big-endian-build.patch
rename to meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/fix-big-endian-build.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/implicit-declaration-function-strlcat-strlcopy.patch b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/implicit-declaration-function-strlcat-strlcopy.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/implicit-declaration-function-strlcat-strlcopy.patch
rename to meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/implicit-declaration-function-strlcat-strlcopy.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/mkbootimg-Add-dt-parameter-to-specify-DT-image.patch b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/mkbootimg-Add-dt-parameter-to-specify-DT-image.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/mkbootimg-Add-dt-parameter-to-specify-DT-image.patch
rename to meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/mkbootimg-Add-dt-parameter-to-specify-DT-image.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/mkbootimg.mk b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/mkbootimg.mk
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/mkbootimg.mk
rename to meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/mkbootimg.mk
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/preserve-ownership.patch b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/preserve-ownership.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/preserve-ownership.patch
rename to meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/preserve-ownership.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/remove-bionic-android.patch b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/remove-bionic-android.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/remove-bionic-android.patch
rename to meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/remove-bionic-android.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/remove-selinux-android.patch b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/remove-selinux-android.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/remove-selinux-android.patch
rename to meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/remove-selinux-android.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/use-capability.patch b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/use-capability.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/use-capability.patch
rename to meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/use-capability.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/use-local-socket.patch b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/use-local-socket.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/use-local-socket.patch
rename to meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/use-local-socket.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
rename to meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/bootchart/bootchart/0001-svg-add-rudimentary-support-for-ARM-cpuinfo.patch b/meta-openembedded/meta-oe/recipes-devtools/bootchart/bootchart/0001-svg-add-rudimentary-support-for-ARM-cpuinfo.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/bootchart/bootchart/0001-svg-add-rudimentary-support-for-ARM-cpuinfo.patch
rename to meta-openembedded/meta-oe/recipes-devtools/bootchart/bootchart/0001-svg-add-rudimentary-support-for-ARM-cpuinfo.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/bootchart/bootchart/0002-svg-open-etc-os-release-and-use-PRETTY_NAME-for-the-.patch b/meta-openembedded/meta-oe/recipes-devtools/bootchart/bootchart/0002-svg-open-etc-os-release-and-use-PRETTY_NAME-for-the-.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/bootchart/bootchart/0002-svg-open-etc-os-release-and-use-PRETTY_NAME-for-the-.patch
rename to meta-openembedded/meta-oe/recipes-devtools/bootchart/bootchart/0002-svg-open-etc-os-release-and-use-PRETTY_NAME-for-the-.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/bootchart/bootchart_git.bb b/meta-openembedded/meta-oe/recipes-devtools/bootchart/bootchart_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/bootchart/bootchart_git.bb
rename to meta-openembedded/meta-oe/recipes-devtools/bootchart/bootchart_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-Replace-use-of-struct-ucontext-with-ucontext_t.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-Replace-use-of-struct-ucontext-with-ucontext_t.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-Replace-use-of-struct-ucontext-with-ucontext_t.patch
rename to meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-Replace-use-of-struct-ucontext-with-ucontext_t.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-Turn-off-sign-compare-for-musl-libc.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-Turn-off-sign-compare-for-musl-libc.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-Turn-off-sign-compare-for-musl-libc.patch
rename to meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-Turn-off-sign-compare-for-musl-libc.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-disable-calls-to-getcontext-with-musl.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-disable-calls-to-getcontext-with-musl.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-disable-calls-to-getcontext-with-musl.patch
rename to meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-disable-calls-to-getcontext-with-musl.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-include-sys-reg.h-to-get-__WORDSIZE-on-musl-libc.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-include-sys-reg.h-to-get-__WORDSIZE-on-musl-libc.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-include-sys-reg.h-to-get-__WORDSIZE-on-musl-libc.patch
rename to meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-include-sys-reg.h-to-get-__WORDSIZE-on-musl-libc.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-lss-Match-syscalls-to-match-musl.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-lss-Match-syscalls-to-match-musl.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-lss-Match-syscalls-to-match-musl.patch
rename to meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-lss-Match-syscalls-to-match-musl.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0002-Avoid-using-basename.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0002-Avoid-using-basename.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0002-Avoid-using-basename.patch
rename to meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0002-Avoid-using-basename.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0002-Use-_fpstate-instead-of-_libc_fpstate-on-linux.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0002-Use-_fpstate-instead-of-_libc_fpstate-on-linux.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0002-Use-_fpstate-instead-of-_libc_fpstate-on-linux.patch
rename to meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0002-Use-_fpstate-instead-of-_libc_fpstate-on-linux.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0002-sys-signal.h-is-a-nonportable-alias-for-signal.h.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0002-sys-signal.h-is-a-nonportable-alias-for-signal.h.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0002-sys-signal.h-is-a-nonportable-alias-for-signal.h.patch
rename to meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0002-sys-signal.h-is-a-nonportable-alias-for-signal.h.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0003-Dont-include-stab.h.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0003-Dont-include-stab.h.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0003-Dont-include-stab.h.patch
rename to meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0003-Dont-include-stab.h.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0003-Fix-conflict-between-musl-libc-dirent.h-and-lss.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0003-Fix-conflict-between-musl-libc-dirent.h-and-lss.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0003-Fix-conflict-between-musl-libc-dirent.h-and-lss.patch
rename to meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0003-Fix-conflict-between-musl-libc-dirent.h-and-lss.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0004-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0004-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0004-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch
rename to meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0004-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0005-md2core-Replace-basename.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0005-md2core-Replace-basename.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0005-md2core-Replace-basename.patch
rename to meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0005-md2core-Replace-basename.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/mcontext.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/mcontext.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/mcontext.patch
rename to meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/mcontext.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/mips_asm_sgidefs.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/mips_asm_sgidefs.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/mips_asm_sgidefs.patch
rename to meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/mips_asm_sgidefs.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad_git.bb b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad_git.bb
rename to meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.6.1.bb b/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.6.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.6.1.bb
rename to meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_0.6.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb/remove-help2man.patch b/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb/remove-help2man.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb/remove-help2man.patch
rename to meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb/remove-help2man.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb_0.6.8.bb b/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb_0.6.8.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb_0.6.8.bb
rename to meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb_0.6.8.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/cloud9/cloud9/cloud9-avahi.service b/meta-openembedded/meta-oe/recipes-devtools/cloud9/cloud9/cloud9-avahi.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/cloud9/cloud9/cloud9-avahi.service
rename to meta-openembedded/meta-oe/recipes-devtools/cloud9/cloud9/cloud9-avahi.service
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/cloud9/cloud9/cloud9.service b/meta-openembedded/meta-oe/recipes-devtools/cloud9/cloud9/cloud9.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/cloud9/cloud9/cloud9.service
rename to meta-openembedded/meta-oe/recipes-devtools/cloud9/cloud9/cloud9.service
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/cloud9/cloud9/index.js b/meta-openembedded/meta-oe/recipes-devtools/cloud9/cloud9/index.js
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/cloud9/cloud9/index.js
rename to meta-openembedded/meta-oe/recipes-devtools/cloud9/cloud9/index.js
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/concurrencykit/concurrencykit/cross.patch b/meta-openembedded/meta-oe/recipes-devtools/concurrencykit/concurrencykit/cross.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/concurrencykit/concurrencykit/cross.patch
rename to meta-openembedded/meta-oe/recipes-devtools/concurrencykit/concurrencykit/cross.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb b/meta-openembedded/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb
rename to meta-openembedded/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/cpuid/cpuid_20170122.bb b/meta-openembedded/meta-oe/recipes-devtools/cpuid/cpuid_20170122.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/cpuid/cpuid_20170122.bb
rename to meta-openembedded/meta-oe/recipes-devtools/cpuid/cpuid_20170122.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/cscope/cscope_15.8b.bb b/meta-openembedded/meta-oe/recipes-devtools/cscope/cscope_15.8b.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/cscope/cscope_15.8b.bb
rename to meta-openembedded/meta-oe/recipes-devtools/cscope/cscope_15.8b.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.8.bb b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.8.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.8.bb
rename to meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.8.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap/devices.tar.gz b/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap/devices.tar.gz
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap/devices.tar.gz
rename to meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap/devices.tar.gz
Binary files differ
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.67.bb b/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.67.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.67.bb
rename to meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.67.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/dejagnu/dejagnu/configure.patch b/meta-openembedded/meta-oe/recipes-devtools/dejagnu/dejagnu/configure.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/dejagnu/dejagnu/configure.patch
rename to meta-openembedded/meta-oe/recipes-devtools/dejagnu/dejagnu/configure.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/dejagnu/dejagnu_1.4.4.bb b/meta-openembedded/meta-oe/recipes-devtools/dejagnu/dejagnu_1.4.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/dejagnu/dejagnu_1.4.4.bb
rename to meta-openembedded/meta-oe/recipes-devtools/dejagnu/dejagnu_1.4.4.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/dmalloc/dmalloc/0001-undefined-strdup-macro.patch b/meta-openembedded/meta-oe/recipes-devtools/dmalloc/dmalloc/0001-undefined-strdup-macro.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/dmalloc/dmalloc/0001-undefined-strdup-macro.patch
rename to meta-openembedded/meta-oe/recipes-devtools/dmalloc/dmalloc/0001-undefined-strdup-macro.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/dmalloc/dmalloc/02-Makefile.in.patch b/meta-openembedded/meta-oe/recipes-devtools/dmalloc/dmalloc/02-Makefile.in.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/dmalloc/dmalloc/02-Makefile.in.patch
rename to meta-openembedded/meta-oe/recipes-devtools/dmalloc/dmalloc/02-Makefile.in.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/dmalloc/dmalloc/03-threads.patch b/meta-openembedded/meta-oe/recipes-devtools/dmalloc/dmalloc/03-threads.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/dmalloc/dmalloc/03-threads.patch
rename to meta-openembedded/meta-oe/recipes-devtools/dmalloc/dmalloc/03-threads.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/dmalloc/dmalloc/100-use-xtools.patch b/meta-openembedded/meta-oe/recipes-devtools/dmalloc/dmalloc/100-use-xtools.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/dmalloc/dmalloc/100-use-xtools.patch
rename to meta-openembedded/meta-oe/recipes-devtools/dmalloc/dmalloc/100-use-xtools.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/dmalloc/dmalloc/13-fix-ldflags-in-makefile.patch b/meta-openembedded/meta-oe/recipes-devtools/dmalloc/dmalloc/13-fix-ldflags-in-makefile.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/dmalloc/dmalloc/13-fix-ldflags-in-makefile.patch
rename to meta-openembedded/meta-oe/recipes-devtools/dmalloc/dmalloc/13-fix-ldflags-in-makefile.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/dmalloc/dmalloc/130-mips.patch b/meta-openembedded/meta-oe/recipes-devtools/dmalloc/dmalloc/130-mips.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/dmalloc/dmalloc/130-mips.patch
rename to meta-openembedded/meta-oe/recipes-devtools/dmalloc/dmalloc/130-mips.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/dmalloc/dmalloc/150-use_DESTDIR.patch b/meta-openembedded/meta-oe/recipes-devtools/dmalloc/dmalloc/150-use_DESTDIR.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/dmalloc/dmalloc/150-use_DESTDIR.patch
rename to meta-openembedded/meta-oe/recipes-devtools/dmalloc/dmalloc/150-use_DESTDIR.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/dmalloc/dmalloc/configure-pagesize-HACK.patch b/meta-openembedded/meta-oe/recipes-devtools/dmalloc/dmalloc/configure-pagesize-HACK.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/dmalloc/dmalloc/configure-pagesize-HACK.patch
rename to meta-openembedded/meta-oe/recipes-devtools/dmalloc/dmalloc/configure-pagesize-HACK.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/dmalloc/dmalloc_5.5.2.bb b/meta-openembedded/meta-oe/recipes-devtools/dmalloc/dmalloc_5.5.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/dmalloc/dmalloc_5.5.2.bb
rename to meta-openembedded/meta-oe/recipes-devtools/dmalloc/dmalloc_5.5.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/files/0001-correct-version-for-so-lib.patch b/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/files/0001-correct-version-for-so-lib.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/files/0001-correct-version-for-so-lib.patch
rename to meta-openembedded/meta-oe/recipes-devtools/flatbuffers/files/0001-correct-version-for-so-lib.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/files/0001-flatbuffers-Move-EndianSwap-template-to-flatbuffers-.patch b/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/files/0001-flatbuffers-Move-EndianSwap-template-to-flatbuffers-.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/files/0001-flatbuffers-Move-EndianSwap-template-to-flatbuffers-.patch
rename to meta-openembedded/meta-oe/recipes-devtools/flatbuffers/files/0001-flatbuffers-Move-EndianSwap-template-to-flatbuffers-.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/files/0002-use-__builtin_bswap16-when-building-with-clang.patch b/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/files/0002-use-__builtin_bswap16-when-building-with-clang.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/files/0002-use-__builtin_bswap16-when-building-with-clang.patch
rename to meta-openembedded/meta-oe/recipes-devtools/flatbuffers/files/0002-use-__builtin_bswap16-when-building-with-clang.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.9.0.bb b/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.9.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.9.0.bb
rename to meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers_1.9.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.31.bb b/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.31.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.31.bb
rename to meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.31.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.31.bb b/meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.31.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.31.bb
rename to meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.31.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/giflib/giflib_5.1.4.bb b/meta-openembedded/meta-oe/recipes-devtools/giflib/giflib_5.1.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/giflib/giflib_5.1.4.bb
rename to meta-openembedded/meta-oe/recipes-devtools/giflib/giflib_5.1.4.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/glade/glade/remove-yelp-help-rules-var.patch b/meta-openembedded/meta-oe/recipes-devtools/glade/glade/remove-yelp-help-rules-var.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/glade/glade/remove-yelp-help-rules-var.patch
rename to meta-openembedded/meta-oe/recipes-devtools/glade/glade/remove-yelp-help-rules-var.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/glade/glade_3.20.2.bb b/meta-openembedded/meta-oe/recipes-devtools/glade/glade_3.20.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/glade/glade_3.20.2.bb
rename to meta-openembedded/meta-oe/recipes-devtools/glade/glade_3.20.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch
rename to meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch
rename to meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0004-CMakeLists.txt-Find-c-ares-in-target-sysroot-alone.patch b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0004-CMakeLists.txt-Find-c-ares-in-target-sysroot-alone.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0004-CMakeLists.txt-Find-c-ares-in-target-sysroot-alone.patch
rename to meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0004-CMakeLists.txt-Find-c-ares-in-target-sysroot-alone.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.8.5.bb b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.8.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.8.5.bb
rename to meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.8.5.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/icon-slicer/files/0001-Makefile.am-no-examples.patch b/meta-openembedded/meta-oe/recipes-devtools/icon-slicer/files/0001-Makefile.am-no-examples.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/icon-slicer/files/0001-Makefile.am-no-examples.patch
rename to meta-openembedded/meta-oe/recipes-devtools/icon-slicer/files/0001-Makefile.am-no-examples.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/icon-slicer/icon-slicer_0.3.bb b/meta-openembedded/meta-oe/recipes-devtools/icon-slicer/icon-slicer_0.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/icon-slicer/icon-slicer_0.3.bb
rename to meta-openembedded/meta-oe/recipes-devtools/icon-slicer/icon-slicer_0.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/iptraf/iptraf-ng/0001-Fix-printd-formatting-strings.patch b/meta-openembedded/meta-oe/recipes-devtools/iptraf/iptraf-ng/0001-Fix-printd-formatting-strings.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/iptraf/iptraf-ng/0001-Fix-printd-formatting-strings.patch
rename to meta-openembedded/meta-oe/recipes-devtools/iptraf/iptraf-ng/0001-Fix-printd-formatting-strings.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/iptraf/iptraf-ng/ncurses-config.patch b/meta-openembedded/meta-oe/recipes-devtools/iptraf/iptraf-ng/ncurses-config.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/iptraf/iptraf-ng/ncurses-config.patch
rename to meta-openembedded/meta-oe/recipes-devtools/iptraf/iptraf-ng/ncurses-config.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/iptraf/iptraf-ng_1.1.4.bb b/meta-openembedded/meta-oe/recipes-devtools/iptraf/iptraf-ng_1.1.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/iptraf/iptraf-ng_1.1.4.bb
rename to meta-openembedded/meta-oe/recipes-devtools/iptraf/iptraf-ng_1.1.4.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/jq/jq/Support-without-oniguruma.patch b/meta-openembedded/meta-oe/recipes-devtools/jq/jq/Support-without-oniguruma.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/jq/jq/Support-without-oniguruma.patch
rename to meta-openembedded/meta-oe/recipes-devtools/jq/jq/Support-without-oniguruma.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/jq/jq_1.5.bb b/meta-openembedded/meta-oe/recipes-devtools/jq/jq_1.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/jq/jq_1.5.bb
rename to meta-openembedded/meta-oe/recipes-devtools/jq/jq_1.5.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/json-spirit/json-spirit/0001-Adjust-the-cmake-files.patch b/meta-openembedded/meta-oe/recipes-devtools/json-spirit/json-spirit/0001-Adjust-the-cmake-files.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/json-spirit/json-spirit/0001-Adjust-the-cmake-files.patch
rename to meta-openembedded/meta-oe/recipes-devtools/json-spirit/json-spirit/0001-Adjust-the-cmake-files.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/json-spirit/json-spirit/0001-Link-to-libatomic.patch b/meta-openembedded/meta-oe/recipes-devtools/json-spirit/json-spirit/0001-Link-to-libatomic.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/json-spirit/json-spirit/0001-Link-to-libatomic.patch
rename to meta-openembedded/meta-oe/recipes-devtools/json-spirit/json-spirit/0001-Link-to-libatomic.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/json-spirit/json-spirit/json_spirit_v4.08.zip b/meta-openembedded/meta-oe/recipes-devtools/json-spirit/json-spirit/json_spirit_v4.08.zip
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/json-spirit/json-spirit/json_spirit_v4.08.zip
rename to meta-openembedded/meta-oe/recipes-devtools/json-spirit/json-spirit/json_spirit_v4.08.zip
Binary files differ
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb b/meta-openembedded/meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb
rename to meta-openembedded/meta-oe/recipes-devtools/json-spirit/json-spirit_4.08.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.8.4.bb b/meta-openembedded/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.8.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.8.4.bb
rename to meta-openembedded/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.8.4.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-cmake-replace-hardcoded-lib-CMAKE_LIBRARY_PATH-with-.patch b/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-cmake-replace-hardcoded-lib-CMAKE_LIBRARY_PATH-with-.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-cmake-replace-hardcoded-lib-CMAKE_LIBRARY_PATH-with-.patch
rename to meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-cmake-replace-hardcoded-lib-CMAKE_LIBRARY_PATH-with-.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-filedescriptorclient-Typecast-min-arguments-correctl.patch b/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-filedescriptorclient-Typecast-min-arguments-correctl.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-filedescriptorclient-Typecast-min-arguments-correctl.patch
rename to meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-filedescriptorclient-Typecast-min-arguments-correctl.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-filedescriptorserver-Include-sys-select.h-before-oth.patch b/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-filedescriptorserver-Include-sys-select.h-before-oth.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-filedescriptorserver-Include-sys-select.h-before-oth.patch
rename to meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-filedescriptorserver-Include-sys-select.h-before-oth.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-memset-and-family-needs-to-include-string.h.patch b/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-memset-and-family-needs-to-include-string.h.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-memset-and-family-needs-to-include-string.h.patch
rename to meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0001-memset-and-family-needs-to-include-string.h.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0002-Fix-build-problem-on-Mac.patch b/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0002-Fix-build-problem-on-Mac.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0002-Fix-build-problem-on-Mac.patch
rename to meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc/0002-Fix-build-problem-on-Mac.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc_0.7.0.bb b/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc_0.7.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc_0.7.0.bb
rename to meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc_0.7.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/kconfig-frontends/files/0001-Makefile-ensure-frontends-exits-before-writing-into-.patch b/meta-openembedded/meta-oe/recipes-devtools/kconfig-frontends/files/0001-Makefile-ensure-frontends-exits-before-writing-into-.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/kconfig-frontends/files/0001-Makefile-ensure-frontends-exits-before-writing-into-.patch
rename to meta-openembedded/meta-oe/recipes-devtools/kconfig-frontends/files/0001-Makefile-ensure-frontends-exits-before-writing-into-.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/kconfig-frontends/files/0001-Switch-utils-kconfig-diff-to-use-Python-3.patch b/meta-openembedded/meta-oe/recipes-devtools/kconfig-frontends/files/0001-Switch-utils-kconfig-diff-to-use-Python-3.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/kconfig-frontends/files/0001-Switch-utils-kconfig-diff-to-use-Python-3.patch
rename to meta-openembedded/meta-oe/recipes-devtools/kconfig-frontends/files/0001-Switch-utils-kconfig-diff-to-use-Python-3.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb b/meta-openembedded/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb
rename to meta-openembedded/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/lemon/files/lemon.1 b/meta-openembedded/meta-oe/recipes-devtools/lemon/files/lemon.1
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/lemon/files/lemon.1
rename to meta-openembedded/meta-oe/recipes-devtools/lemon/files/lemon.1
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/lemon/lemon.inc b/meta-openembedded/meta-oe/recipes-devtools/lemon/lemon.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/lemon/lemon.inc
rename to meta-openembedded/meta-oe/recipes-devtools/lemon/lemon.inc
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/lemon/lemon_3.7.3.bb b/meta-openembedded/meta-oe/recipes-devtools/lemon/lemon_3.7.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/lemon/lemon_3.7.3.bb
rename to meta-openembedded/meta-oe/recipes-devtools/lemon/lemon_3.7.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/libedit/libedit/stdc-predef.patch b/meta-openembedded/meta-oe/recipes-devtools/libedit/libedit/stdc-predef.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/libedit/libedit/stdc-predef.patch
rename to meta-openembedded/meta-oe/recipes-devtools/libedit/libedit/stdc-predef.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/libedit/libedit_20170329-3.1.bb b/meta-openembedded/meta-oe/recipes-devtools/libedit/libedit_20170329-3.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/libedit/libedit_20170329-3.1.bb
rename to meta-openembedded/meta-oe/recipes-devtools/libedit/libedit_20170329-3.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/libfribidi/fribidi_0.19.7.bb b/meta-openembedded/meta-oe/recipes-devtools/libfribidi/fribidi_0.19.7.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/libfribidi/fribidi_0.19.7.bb
rename to meta-openembedded/meta-oe/recipes-devtools/libfribidi/fribidi_0.19.7.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/libgee/libgee_0.18.0.bb b/meta-openembedded/meta-oe/recipes-devtools/libgee/libgee_0.18.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/libgee/libgee_0.18.0.bb
rename to meta-openembedded/meta-oe/recipes-devtools/libgee/libgee_0.18.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/librcf/librcf/0001-Add-CMake-build-files.patch b/meta-openembedded/meta-oe/recipes-devtools/librcf/librcf/0001-Add-CMake-build-files.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/librcf/librcf/0001-Add-CMake-build-files.patch
rename to meta-openembedded/meta-oe/recipes-devtools/librcf/librcf/0001-Add-CMake-build-files.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/librcf/librcf/0001-Check-for-__powerpc__-define.patch b/meta-openembedded/meta-oe/recipes-devtools/librcf/librcf/0001-Check-for-__powerpc__-define.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/librcf/librcf/0001-Check-for-__powerpc__-define.patch
rename to meta-openembedded/meta-oe/recipes-devtools/librcf/librcf/0001-Check-for-__powerpc__-define.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/librcf/librcf/0001-ClientStub.hpp-fix-a-clang-compiling-issue.patch b/meta-openembedded/meta-oe/recipes-devtools/librcf/librcf/0001-ClientStub.hpp-fix-a-clang-compiling-issue.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/librcf/librcf/0001-ClientStub.hpp-fix-a-clang-compiling-issue.patch
rename to meta-openembedded/meta-oe/recipes-devtools/librcf/librcf/0001-ClientStub.hpp-fix-a-clang-compiling-issue.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/librcf/librcf/aarch64-support.patch b/meta-openembedded/meta-oe/recipes-devtools/librcf/librcf/aarch64-support.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/librcf/librcf/aarch64-support.patch
rename to meta-openembedded/meta-oe/recipes-devtools/librcf/librcf/aarch64-support.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/librcf/librcf/mips-support.patch b/meta-openembedded/meta-oe/recipes-devtools/librcf/librcf/mips-support.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/librcf/librcf/mips-support.patch
rename to meta-openembedded/meta-oe/recipes-devtools/librcf/librcf/mips-support.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb b/meta-openembedded/meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb
rename to meta-openembedded/meta-oe/recipes-devtools/librcf/librcf_2.2.0.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/libsombok3/libsombok3/0001-configure.ac-fix-cross-compiling-issue.patch b/meta-openembedded/meta-oe/recipes-devtools/libsombok3/libsombok3/0001-configure.ac-fix-cross-compiling-issue.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/libsombok3/libsombok3/0001-configure.ac-fix-cross-compiling-issue.patch
rename to meta-openembedded/meta-oe/recipes-devtools/libsombok3/libsombok3/0001-configure.ac-fix-cross-compiling-issue.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/libsombok3/libsombok3_2.4.0.bb b/meta-openembedded/meta-oe/recipes-devtools/libsombok3/libsombok3_2.4.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/libsombok3/libsombok3_2.4.0.bb
rename to meta-openembedded/meta-oe/recipes-devtools/libsombok3/libsombok3_2.4.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox/0001-version-libraries.patch b/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox/0001-version-libraries.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox/0001-version-libraries.patch
rename to meta-openembedded/meta-oe/recipes-devtools/libubox/libubox/0001-version-libraries.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox/fix-libdir.patch b/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox/fix-libdir.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox/fix-libdir.patch
rename to meta-openembedded/meta-oe/recipes-devtools/libubox/libubox/fix-libdir.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox_git.bb b/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox_git.bb
rename to meta-openembedded/meta-oe/recipes-devtools/libubox/libubox_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/log4cplus/log4cplus_1.2.0.bb b/meta-openembedded/meta-oe/recipes-devtools/log4cplus/log4cplus_1.2.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/log4cplus/log4cplus_1.2.0.bb
rename to meta-openembedded/meta-oe/recipes-devtools/log4cplus/log4cplus_1.2.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-ARM-code-has-unreachable-code-after-switch-statement.patch b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-ARM-code-has-unreachable-code-after-switch-statement.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-ARM-code-has-unreachable-code-after-switch-statement.patch
rename to meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-ARM-code-has-unreachable-code-after-switch-statement.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-Add-support-for-mips64-n32-n64.patch b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-Add-support-for-mips64-n32-n64.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-Add-support-for-mips64-n32-n64.patch
rename to meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-Add-support-for-mips64-n32-n64.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-Fix-tautological-compare-warning.patch b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-Fix-tautological-compare-warning.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-Fix-tautological-compare-warning.patch
rename to meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-Fix-tautological-compare-warning.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-Use-correct-enum-type.patch b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-Use-correct-enum-type.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-Use-correct-enum-type.patch
rename to meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-Use-correct-enum-type.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-configure-Recognise-linux-musl-as-a-host-OS.patch b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-configure-Recognise-linux-musl-as-a-host-OS.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-configure-Recognise-linux-musl-as-a-host-OS.patch
rename to meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-configure-Recognise-linux-musl-as-a-host-OS.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-mips-plt.c-Delete-include-error.h.patch b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-mips-plt.c-Delete-include-error.h.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-mips-plt.c-Delete-include-error.h.patch
rename to meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-mips-plt.c-Delete-include-error.h.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-replace-readdir_r-with-readdir.patch b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-replace-readdir_r-with-readdir.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-replace-readdir_r-with-readdir.patch
rename to meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-replace-readdir_r-with-readdir.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0002-Fix-const-qualifier-error.patch b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0002-Fix-const-qualifier-error.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0002-Fix-const-qualifier-error.patch
rename to meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0002-Fix-const-qualifier-error.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/configure-allow-to-disable-selinux-support.patch b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/configure-allow-to-disable-selinux-support.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/configure-allow-to-disable-selinux-support.patch
rename to meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/configure-allow-to-disable-selinux-support.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb
rename to meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/lua/lua/lua.pc.in b/meta-openembedded/meta-oe/recipes-devtools/lua/lua/lua.pc.in
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/lua/lua/lua.pc.in
rename to meta-openembedded/meta-oe/recipes-devtools/lua/lua/lua.pc.in
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/lua/lua/run-ptest b/meta-openembedded/meta-oe/recipes-devtools/lua/lua/run-ptest
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/lua/lua/run-ptest
rename to meta-openembedded/meta-oe/recipes-devtools/lua/lua/run-ptest
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/lua/lua/uclibc-pthread.patch b/meta-openembedded/meta-oe/recipes-devtools/lua/lua/uclibc-pthread.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/lua/lua/uclibc-pthread.patch
rename to meta-openembedded/meta-oe/recipes-devtools/lua/lua/uclibc-pthread.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/lua/lua_5.3.4.bb b/meta-openembedded/meta-oe/recipes-devtools/lua/lua_5.3.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/lua/lua_5.3.4.bb
rename to meta-openembedded/meta-oe/recipes-devtools/lua/lua_5.3.4.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch b/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch
rename to meta-openembedded/meta-oe/recipes-devtools/luajit/luajit/0001-Do-not-strip-automatically-this-leaves-the-stripping.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit/clang.patch b/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit/clang.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit/clang.patch
rename to meta-openembedded/meta-oe/recipes-devtools/luajit/luajit/clang.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb b/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
rename to meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/mcpp/files/ice-mcpp.patch b/meta-openembedded/meta-oe/recipes-devtools/mcpp/files/ice-mcpp.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/mcpp/files/ice-mcpp.patch
rename to meta-openembedded/meta-oe/recipes-devtools/mcpp/files/ice-mcpp.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb b/meta-openembedded/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb
rename to meta-openembedded/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/memstat/memstat/0001-Include-limits.h-for-PATH_MAX-definition.patch b/meta-openembedded/meta-oe/recipes-devtools/memstat/memstat/0001-Include-limits.h-for-PATH_MAX-definition.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/memstat/memstat/0001-Include-limits.h-for-PATH_MAX-definition.patch
rename to meta-openembedded/meta-oe/recipes-devtools/memstat/memstat/0001-Include-limits.h-for-PATH_MAX-definition.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/memstat/memstat_1.0.bb b/meta-openembedded/meta-oe/recipes-devtools/memstat/memstat_1.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/memstat/memstat_1.0.bb
rename to meta-openembedded/meta-oe/recipes-devtools/memstat/memstat_1.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_4.4.bb b/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_4.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_4.4.bb
rename to meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_4.4.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_3.2.bb b/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_3.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_3.2.bb
rename to meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_3.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-c/0001-Fix-Werror-class-memaccess.patch b/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-c/0001-Fix-Werror-class-memaccess.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-c/0001-Fix-Werror-class-memaccess.patch
rename to meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-c/0001-Fix-Werror-class-memaccess.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb b/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb
rename to meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/msr-tools/msr-tools_1.3.bb b/meta-openembedded/meta-oe/recipes-devtools/msr-tools/msr-tools_1.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/msr-tools/msr-tools_1.3.bb
rename to meta-openembedded/meta-oe/recipes-devtools/msr-tools/msr-tools_1.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
rename to meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-Disable-running-gyp-files-for-bundled-deps.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_8.9.4.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_8.9.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_8.9.4.bb
rename to meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_8.9.4.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0001-Add-fallthrough-comments.patch b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0001-Add-fallthrough-comments.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0001-Add-fallthrough-comments.patch
rename to meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0001-Add-fallthrough-comments.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0002-Workaround-new-warnings-generated-by-GCC-7.patch b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0002-Workaround-new-warnings-generated-by-GCC-7.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0002-Workaround-new-warnings-generated-by-GCC-7.patch
rename to meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0002-Workaround-new-warnings-generated-by-GCC-7.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0003-armv7a-Add-missing-break-to-fix-fallthrough-warning.patch b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0003-armv7a-Add-missing-break-to-fix-fallthrough-warning.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0003-armv7a-Add-missing-break-to-fix-fallthrough-warning.patch
rename to meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0003-armv7a-Add-missing-break-to-fix-fallthrough-warning.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0004-Fix-overflow-warning.patch b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0004-Fix-overflow-warning.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0004-Fix-overflow-warning.patch
rename to meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0004-Fix-overflow-warning.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0005-command-Move-the-fall-through-comment-to-right-scope.patch b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0005-command-Move-the-fall-through-comment-to-right-scope.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0005-command-Move-the-fall-through-comment-to-right-scope.patch
rename to meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0005-command-Move-the-fall-through-comment-to-right-scope.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb
rename to meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb b/meta-openembedded/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb
rename to meta-openembedded/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/perl/ipc-run_0.96.bb b/meta-openembedded/meta-oe/recipes-devtools/perl/ipc-run_0.96.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/perl/ipc-run_0.96.bb
rename to meta-openembedded/meta-oe/recipes-devtools/perl/ipc-run_0.96.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.043.bb b/meta-openembedded/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.043.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.043.bb
rename to meta-openembedded/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.043.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/perl/libdbi-perl_1.641.bb b/meta-openembedded/meta-oe/recipes-devtools/perl/libdbi-perl_1.641.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/perl/libdbi-perl_1.641.bb
rename to meta-openembedded/meta-oe/recipes-devtools/perl/libdbi-perl_1.641.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/perl/libio-pty-perl_1.12.bb b/meta-openembedded/meta-oe/recipes-devtools/perl/libio-pty-perl_1.12.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/perl/libio-pty-perl_1.12.bb
rename to meta-openembedded/meta-oe/recipes-devtools/perl/libio-pty-perl_1.12.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php.inc b/meta-openembedded/meta-oe/recipes-devtools/php/php.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php.inc
rename to meta-openembedded/meta-oe/recipes-devtools/php/php.inc
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-Add-lpthread-to-link.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-Add-lpthread-to-link.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-Add-lpthread-to-link.patch
rename to meta-openembedded/meta-oe/recipes-devtools/php/php/0001-Add-lpthread-to-link.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-acinclude-use-pkgconfig-for-libxml2-config.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-acinclude-use-pkgconfig-for-libxml2-config.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-acinclude-use-pkgconfig-for-libxml2-config.patch
rename to meta-openembedded/meta-oe/recipes-devtools/php/php/0001-acinclude-use-pkgconfig-for-libxml2-config.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-acinclude.m4-don-t-unset-cache-variables.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-acinclude.m4-don-t-unset-cache-variables.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-acinclude.m4-don-t-unset-cache-variables.patch
rename to meta-openembedded/meta-oe/recipes-devtools/php/php/0001-acinclude.m4-don-t-unset-cache-variables.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-acinclude.m4-skip-binconfig-check-for-libxml.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-acinclude.m4-skip-binconfig-check-for-libxml.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-acinclude.m4-skip-binconfig-check-for-libxml.patch
rename to meta-openembedded/meta-oe/recipes-devtools/php/php/0001-acinclude.m4-skip-binconfig-check-for-libxml.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-fix-error-caused-by-a-new-variable-is-declared-after.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-fix-error-caused-by-a-new-variable-is-declared-after.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-fix-error-caused-by-a-new-variable-is-declared-after.patch
rename to meta-openembedded/meta-oe/recipes-devtools/php/php/0001-fix-error-caused-by-a-new-variable-is-declared-after.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-main-php_ini.c-build-empty-php_load_zend_extension_c.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-main-php_ini.c-build-empty-php_load_zend_extension_c.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-main-php_ini.c-build-empty-php_load_zend_extension_c.patch
rename to meta-openembedded/meta-oe/recipes-devtools/php/php/0001-main-php_ini.c-build-empty-php_load_zend_extension_c.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch
rename to meta-openembedded/meta-oe/recipes-devtools/php/php/0001-opcache-config.m4-enable-opcache.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-php-don-t-use-broken-wrapper-for-mkdir.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-php-don-t-use-broken-wrapper-for-mkdir.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/0001-php-don-t-use-broken-wrapper-for-mkdir.patch
rename to meta-openembedded/meta-oe/recipes-devtools/php/php/0001-php-don-t-use-broken-wrapper-for-mkdir.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/70_mod_php5.conf b/meta-openembedded/meta-oe/recipes-devtools/php/php/70_mod_php5.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/70_mod_php5.conf
rename to meta-openembedded/meta-oe/recipes-devtools/php/php/70_mod_php5.conf
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/70_mod_php7.conf b/meta-openembedded/meta-oe/recipes-devtools/php/php/70_mod_php7.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/70_mod_php7.conf
rename to meta-openembedded/meta-oe/recipes-devtools/php/php/70_mod_php7.conf
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/acinclude-xml2-config.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/acinclude-xml2-config.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/acinclude-xml2-config.patch
rename to meta-openembedded/meta-oe/recipes-devtools/php/php/acinclude-xml2-config.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/change-AC_TRY_RUN-to-AC_TRY_LINK.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
rename to meta-openembedded/meta-oe/recipes-devtools/php/php/change-AC_TRY_RUN-to-AC_TRY_LINK.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/iconv.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/iconv.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/iconv.patch
rename to meta-openembedded/meta-oe/recipes-devtools/php/php/iconv.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/imap-fix-autofoo.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/imap-fix-autofoo.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/imap-fix-autofoo.patch
rename to meta-openembedded/meta-oe/recipes-devtools/php/php/imap-fix-autofoo.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/pear-makefile.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/pear-makefile.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/pear-makefile.patch
rename to meta-openembedded/meta-oe/recipes-devtools/php/php/pear-makefile.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/phar-makefile.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/phar-makefile.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/phar-makefile.patch
rename to meta-openembedded/meta-oe/recipes-devtools/php/php/phar-makefile.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/php-fpm-apache.conf b/meta-openembedded/meta-oe/recipes-devtools/php/php/php-fpm-apache.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/php-fpm-apache.conf
rename to meta-openembedded/meta-oe/recipes-devtools/php/php/php-fpm-apache.conf
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/php-fpm.conf b/meta-openembedded/meta-oe/recipes-devtools/php/php/php-fpm.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/php-fpm.conf
rename to meta-openembedded/meta-oe/recipes-devtools/php/php/php-fpm.conf
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/php-fpm.service b/meta-openembedded/meta-oe/recipes-devtools/php/php/php-fpm.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/php-fpm.service
rename to meta-openembedded/meta-oe/recipes-devtools/php/php/php-fpm.service
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/php5-0001-opcache-config.m4-enable-opcache.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/php5-0001-opcache-config.m4-enable-opcache.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/php5-0001-opcache-config.m4-enable-opcache.patch
rename to meta-openembedded/meta-oe/recipes-devtools/php/php/php5-0001-opcache-config.m4-enable-opcache.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/php5-change-AC_TRY_RUN-to-AC_TRY_LINK.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/php5-change-AC_TRY_RUN-to-AC_TRY_LINK.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/php5-change-AC_TRY_RUN-to-AC_TRY_LINK.patch
rename to meta-openembedded/meta-oe/recipes-devtools/php/php/php5-change-AC_TRY_RUN-to-AC_TRY_LINK.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/php5-pear-makefile.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/php5-pear-makefile.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/php5-pear-makefile.patch
rename to meta-openembedded/meta-oe/recipes-devtools/php/php/php5-pear-makefile.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/php5-phar-makefile.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/php5-phar-makefile.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/php5-phar-makefile.patch
rename to meta-openembedded/meta-oe/recipes-devtools/php/php/php5-phar-makefile.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/php_exec_native.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/php_exec_native.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/php_exec_native.patch
rename to meta-openembedded/meta-oe/recipes-devtools/php/php/php_exec_native.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/pthread-check-threads-m4.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/pthread-check-threads-m4.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php/pthread-check-threads-m4.patch
rename to meta-openembedded/meta-oe/recipes-devtools/php/php/pthread-check-threads-m4.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php_5.6.35.bb b/meta-openembedded/meta-oe/recipes-devtools/php/php_5.6.35.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php_5.6.35.bb
rename to meta-openembedded/meta-oe/recipes-devtools/php/php_5.6.35.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php_7.2.4.bb b/meta-openembedded/meta-oe/recipes-devtools/php/php_7.2.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/php/php_7.2.4.bb
rename to meta-openembedded/meta-oe/recipes-devtools/php/php_7.2.4.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/pmtools/pmtools/pmtools-switch-to-dynamic-buffer-for-huge-ACPI-table.patch b/meta-openembedded/meta-oe/recipes-devtools/pmtools/pmtools/pmtools-switch-to-dynamic-buffer-for-huge-ACPI-table.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/pmtools/pmtools/pmtools-switch-to-dynamic-buffer-for-huge-ACPI-table.patch
rename to meta-openembedded/meta-oe/recipes-devtools/pmtools/pmtools/pmtools-switch-to-dynamic-buffer-for-huge-ACPI-table.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/pmtools/pmtools_git.bb b/meta-openembedded/meta-oe/recipes-devtools/pmtools/pmtools_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/pmtools/pmtools_git.bb
rename to meta-openembedded/meta-oe/recipes-devtools/pmtools/pmtools_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.0.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.0.bb
rename to meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.3.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/run-ptest b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/run-ptest
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/run-ptest
rename to meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf/run-ptest
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.5.1.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.5.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.5.1.bb
rename to meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.5.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/python/python-cpuset_1.5.7.bb b/meta-openembedded/meta-oe/recipes-devtools/python/python-cpuset_1.5.7.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/python/python-cpuset_1.5.7.bb
rename to meta-openembedded/meta-oe/recipes-devtools/python/python-cpuset_1.5.7.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/python/python-distutils-extra.bb b/meta-openembedded/meta-oe/recipes-devtools/python/python-distutils-extra.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/python/python-distutils-extra.bb
rename to meta-openembedded/meta-oe/recipes-devtools/python/python-distutils-extra.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/python/python-distutils-extra.inc b/meta-openembedded/meta-oe/recipes-devtools/python/python-distutils-extra.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/python/python-distutils-extra.inc
rename to meta-openembedded/meta-oe/recipes-devtools/python/python-distutils-extra.inc
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/python/python-futures_3.2.0.bb b/meta-openembedded/meta-oe/recipes-devtools/python/python-futures_3.2.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/python/python-futures_3.2.0.bb
rename to meta-openembedded/meta-oe/recipes-devtools/python/python-futures_3.2.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch b/meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch
rename to meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject/0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject_3.28.0.bb b/meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject_3.28.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject_3.28.0.bb
rename to meta-openembedded/meta-oe/recipes-devtools/python/python-pygobject_3.28.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/python/python3-distutils-extra.bb b/meta-openembedded/meta-oe/recipes-devtools/python/python3-distutils-extra.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/python/python3-distutils-extra.bb
rename to meta-openembedded/meta-oe/recipes-devtools/python/python3-distutils-extra.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson/remove-march-native-from-CMAKE_CXX_FLAGS.patch b/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson/remove-march-native-from-CMAKE_CXX_FLAGS.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson/remove-march-native-from-CMAKE_CXX_FLAGS.patch
rename to meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson/remove-march-native-from-CMAKE_CXX_FLAGS.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb b/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
rename to meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Add-option-to-enable-internal-loopback.patch b/meta-openembedded/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Add-option-to-enable-internal-loopback.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Add-option-to-enable-internal-loopback.patch
rename to meta-openembedded/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Add-option-to-enable-internal-loopback.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Makefile-Change-order-of-link-flags.patch b/meta-openembedded/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Makefile-Change-order-of-link-flags.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Makefile-Change-order-of-link-flags.patch
rename to meta-openembedded/meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Makefile-Change-order-of-link-flags.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/serialcheck/serialcheck/0002-Restore-original-loopback-config.patch b/meta-openembedded/meta-oe/recipes-devtools/serialcheck/serialcheck/0002-Restore-original-loopback-config.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/serialcheck/serialcheck/0002-Restore-original-loopback-config.patch
rename to meta-openembedded/meta-oe/recipes-devtools/serialcheck/serialcheck/0002-Restore-original-loopback-config.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb b/meta-openembedded/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb
rename to meta-openembedded/meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/sip/sip_4.19.8.bb b/meta-openembedded/meta-oe/recipes-devtools/sip/sip_4.19.8.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/sip/sip_4.19.8.bb
rename to meta-openembedded/meta-oe/recipes-devtools/sip/sip_4.19.8.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/tclap/tclap/Makefile.am-disable-docs.patch b/meta-openembedded/meta-oe/recipes-devtools/tclap/tclap/Makefile.am-disable-docs.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/tclap/tclap/Makefile.am-disable-docs.patch
rename to meta-openembedded/meta-oe/recipes-devtools/tclap/tclap/Makefile.am-disable-docs.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/tclap/tclap_1.2.1.bb b/meta-openembedded/meta-oe/recipes-devtools/tclap/tclap_1.2.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/tclap/tclap_1.2.1.bb
rename to meta-openembedded/meta-oe/recipes-devtools/tclap/tclap_1.2.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/configure.use.fontconfig.with.xft.patch b/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/configure.use.fontconfig.with.xft.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/configure.use.fontconfig.with.xft.patch
rename to meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/configure.use.fontconfig.with.xft.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff b/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff
rename to meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/fix-xft.diff b/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/fix-xft.diff
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/fix-xft.diff
rename to meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/fix-xft.diff
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/non-linux.diff b/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/non-linux.diff
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/non-linux.diff
rename to meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/non-linux.diff
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/tklibrary.diff b/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/tklibrary.diff
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/tklibrary.diff
rename to meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/tklibrary.diff
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/tkprivate.diff b/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/tkprivate.diff
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/tkprivate.diff
rename to meta-openembedded/meta-oe/recipes-devtools/tcltk/tk/tkprivate.diff
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb b/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb
rename to meta-openembedded/meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.8.bb b/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.8.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.8.bb
rename to meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.8.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/uw-imap/uw-imap/imap-2007e-shared.patch b/meta-openembedded/meta-oe/recipes-devtools/uw-imap/uw-imap/imap-2007e-shared.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/uw-imap/uw-imap/imap-2007e-shared.patch
rename to meta-openembedded/meta-oe/recipes-devtools/uw-imap/uw-imap/imap-2007e-shared.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/uw-imap/uw-imap/imap-2007f-format-security.patch b/meta-openembedded/meta-oe/recipes-devtools/uw-imap/uw-imap/imap-2007f-format-security.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/uw-imap/uw-imap/imap-2007f-format-security.patch
rename to meta-openembedded/meta-oe/recipes-devtools/uw-imap/uw-imap/imap-2007f-format-security.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/uw-imap/uw-imap/quote_cctype.patch b/meta-openembedded/meta-oe/recipes-devtools/uw-imap/uw-imap/quote_cctype.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/uw-imap/uw-imap/quote_cctype.patch
rename to meta-openembedded/meta-oe/recipes-devtools/uw-imap/uw-imap/quote_cctype.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb b/meta-openembedded/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb
rename to meta-openembedded/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/xerces-c/xerces-c_3.1.4.bb b/meta-openembedded/meta-oe/recipes-devtools/xerces-c/xerces-c_3.1.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/xerces-c/xerces-c_3.1.4.bb
rename to meta-openembedded/meta-oe/recipes-devtools/xerces-c/xerces-c_3.1.4.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-fix-compile-failure-against-musl-C-library.patch b/meta-openembedded/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-fix-compile-failure-against-musl-C-library.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-fix-compile-failure-against-musl-C-library.patch
rename to meta-openembedded/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0001-fix-compile-failure-against-musl-C-library.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0002-fix-formatting-issues.patch b/meta-openembedded/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0002-fix-formatting-issues.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0002-fix-formatting-issues.patch
rename to meta-openembedded/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c/0002-fix-formatting-issues.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.31.0.bb b/meta-openembedded/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.31.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.31.0.bb
rename to meta-openembedded/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.31.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb b/meta-openembedded/meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb
rename to meta-openembedded/meta-oe/recipes-devtools/yajl/yajl_1.0.12.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb b/meta-openembedded/meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb
rename to meta-openembedded/meta-oe/recipes-devtools/yajl/yajl_2.1.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch b/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch
rename to meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/boinc-AM_CONDITIONAL.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/cross-compile.patch b/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/cross-compile.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/cross-compile.patch
rename to meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/cross-compile.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/gtk-configure.patch b/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/gtk-configure.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/gtk-configure.patch
rename to meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/gtk-configure.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/opengl_m4_check.patch b/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/opengl_m4_check.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/opengl_m4_check.patch
rename to meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client/opengl_m4_check.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.6.33.bb b/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.6.33.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.6.33.bb
rename to meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.6.33.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/byacc/byacc.inc b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/byacc/byacc.inc
rename to meta-openembedded/meta-oe/recipes-extended/byacc/byacc.inc
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch
rename to meta-openembedded/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/byacc-open.patch b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/byacc-open.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/byacc/byacc/byacc-open.patch
rename to meta-openembedded/meta-oe/recipes-extended/byacc/byacc/byacc-open.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20170201.bb b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20170201.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20170201.bb
rename to meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20170201.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.10.2.bb b/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.10.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.10.2.bb
rename to meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.10.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine/change-hard-coded-lib-path.patch b/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine/change-hard-coded-lib-path.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine/change-hard-coded-lib-path.patch
rename to meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine/change-hard-coded-lib-path.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch b/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch
rename to meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine_3.10.2.bb b/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine_3.10.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine_3.10.2.bb
rename to meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine_3.10.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch
rename to meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Fix-error.patch b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Fix-error.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Fix-error.patch
rename to meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Fix-error.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Modify-cmakelist.patch b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Modify-cmakelist.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Modify-cmakelist.patch
rename to meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Modify-cmakelist.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-fix-the-build-error-when-python-3.0.patch b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-fix-the-build-error-when-python-3.0.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-fix-the-build-error-when-python-3.0.patch
rename to meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-fix-the-build-error-when-python-3.0.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-no-ruby-perl.patch b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-no-ruby-perl.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-no-ruby-perl.patch
rename to meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-no-ruby-perl.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-sblim-sigsegv.patch b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-sblim-sigsegv.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-sblim-sigsegv.patch
rename to meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.4.17-sblim-sigsegv.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.9.5-python-lib-dir.patch b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.9.5-python-lib-dir.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.9.5-python-lib-dir.patch
rename to meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/cmpi-bindings-0.9.5-python-lib-dir.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_git.bb b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_git.bb
rename to meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/0001-conditionally-check-libvirt.patch b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/0001-conditionally-check-libvirt.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/0001-conditionally-check-libvirt.patch
rename to meta-openembedded/meta-oe/recipes-extended/collectd/collectd/0001-conditionally-check-libvirt.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/0001-configure-Check-for-Wno-error-format-truncation-comp.patch b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/0001-configure-Check-for-Wno-error-format-truncation-comp.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/0001-configure-Check-for-Wno-error-format-truncation-comp.patch
rename to meta-openembedded/meta-oe/recipes-extended/collectd/collectd/0001-configure-Check-for-Wno-error-format-truncation-comp.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/0001-fix-to-build-with-glibc-2.25.patch b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/0001-fix-to-build-with-glibc-2.25.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/0001-fix-to-build-with-glibc-2.25.patch
rename to meta-openembedded/meta-oe/recipes-extended/collectd/collectd/0001-fix-to-build-with-glibc-2.25.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/collectd.init b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/collectd.init
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/collectd.init
rename to meta-openembedded/meta-oe/recipes-extended/collectd/collectd/collectd.init
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/collectd.service b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/collectd.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/collectd.service
rename to meta-openembedded/meta-oe/recipes-extended/collectd/collectd/collectd.service
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/no-gcrypt-badpath.patch b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/no-gcrypt-badpath.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/collectd/collectd/no-gcrypt-badpath.patch
rename to meta-openembedded/meta-oe/recipes-extended/collectd/collectd/no-gcrypt-badpath.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.7.2.bb b/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.7.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.7.2.bb
rename to meta-openembedded/meta-oe/recipes-extended/collectd/collectd_5.7.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/ddrescue/ddrescue_1.22.bb b/meta-openembedded/meta-oe/recipes-extended/ddrescue/ddrescue_1.22.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/ddrescue/ddrescue_1.22.bb
rename to meta-openembedded/meta-oe/recipes-extended/ddrescue/ddrescue_1.22.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20171209.bb b/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20171209.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20171209.bb
rename to meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20171209.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.0.bb b/meta-openembedded/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.0.bb
rename to meta-openembedded/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/enscript/enscript/enscript-autoconf.patch b/meta-openembedded/meta-oe/recipes-extended/enscript/enscript/enscript-autoconf.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/enscript/enscript/enscript-autoconf.patch
rename to meta-openembedded/meta-oe/recipes-extended/enscript/enscript/enscript-autoconf.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/enscript/enscript_1.6.6.bb b/meta-openembedded/meta-oe/recipes-extended/enscript/enscript_1.6.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/enscript/enscript_1.6.6.bb
rename to meta-openembedded/meta-oe/recipes-extended/enscript/enscript_1.6.6.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0001-fluent-bit-shared-Link-with-lpthread.patch b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0001-fluent-bit-shared-Link-with-lpthread.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0001-fluent-bit-shared-Link-with-lpthread.patch
rename to meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/0001-fluent-bit-shared-Link-with-lpthread.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/jemalloc.patch b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/jemalloc.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/jemalloc.patch
rename to meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit/jemalloc.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.1.bb b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.1.bb
rename to meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0001-reduce-build-to-conversion-tools-for-native-build.patch b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0001-reduce-build-to-conversion-tools-for-native-build.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0001-reduce-build-to-conversion-tools-for-native-build.patch
rename to meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0001-reduce-build-to-conversion-tools-for-native-build.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0002-do-not-build-demos.patch b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0002-do-not-build-demos.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0002-do-not-build-demos.patch
rename to meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0002-do-not-build-demos.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0003-Use-native-tools-to-build-docs.patch b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0003-Use-native-tools-to-build-docs.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0003-Use-native-tools-to-build-docs.patch
rename to meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0003-Use-native-tools-to-build-docs.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0004-Add-configure-option-to-find-qt5-native-tools.patch b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0004-Add-configure-option-to-find-qt5-native-tools.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0004-Add-configure-option-to-find-qt5-native-tools.patch
rename to meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/0004-Add-configure-option-to-find-qt5-native-tools.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.desktop b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.desktop
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.desktop
rename to meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.desktop
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.png b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.png
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.png
rename to meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.png
Binary files differ
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.2.bb b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.2.bb
rename to meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/haveged/haveged/haveged-init.d-Makefile.am-add-missing-dependency.patch b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged/haveged-init.d-Makefile.am-add-missing-dependency.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/haveged/haveged/haveged-init.d-Makefile.am-add-missing-dependency.patch
rename to meta-openembedded/meta-oe/recipes-extended/haveged/haveged/haveged-init.d-Makefile.am-add-missing-dependency.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.2.bb b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.2.bb
rename to meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/hexedit/hexedit_1.4.2.bb b/meta-openembedded/meta-oe/recipes-extended/hexedit/hexedit_1.4.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/hexedit/hexedit_1.4.2.bb
rename to meta-openembedded/meta-oe/recipes-extended/hexedit/hexedit_1.4.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/hiredis/files/0001-Makefile-remove-hardcoding-of-CC.patch b/meta-openembedded/meta-oe/recipes-extended/hiredis/files/0001-Makefile-remove-hardcoding-of-CC.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/hiredis/files/0001-Makefile-remove-hardcoding-of-CC.patch
rename to meta-openembedded/meta-oe/recipes-extended/hiredis/files/0001-Makefile-remove-hardcoding-of-CC.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_0.13.1.bb b/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_0.13.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_0.13.1.bb
rename to meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_0.13.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/hplip/hplip-3.12.6/0001-include-cups-ppd.h-for-missing-ppd-definitions.patch b/meta-openembedded/meta-oe/recipes-extended/hplip/hplip-3.12.6/0001-include-cups-ppd.h-for-missing-ppd-definitions.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/hplip/hplip-3.12.6/0001-include-cups-ppd.h-for-missing-ppd-definitions.patch
rename to meta-openembedded/meta-oe/recipes-extended/hplip/hplip-3.12.6/0001-include-cups-ppd.h-for-missing-ppd-definitions.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/hplip/hplip-3.12.6/configure.patch b/meta-openembedded/meta-oe/recipes-extended/hplip/hplip-3.12.6/configure.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/hplip/hplip-3.12.6/configure.patch
rename to meta-openembedded/meta-oe/recipes-extended/hplip/hplip-3.12.6/configure.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/hplip/hplip-3.12.6/cups-1.6.patch b/meta-openembedded/meta-oe/recipes-extended/hplip/hplip-3.12.6/cups-1.6.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/hplip/hplip-3.12.6/cups-1.6.patch
rename to meta-openembedded/meta-oe/recipes-extended/hplip/hplip-3.12.6/cups-1.6.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/hplip/hplip-3.12.6/fix-libusb-paths.patch b/meta-openembedded/meta-oe/recipes-extended/hplip/hplip-3.12.6/fix-libusb-paths.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/hplip/hplip-3.12.6/fix-libusb-paths.patch
rename to meta-openembedded/meta-oe/recipes-extended/hplip/hplip-3.12.6/fix-libusb-paths.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/hplip/hplip-3.12.6/setup-add-sleep-after-cups-reset.patch b/meta-openembedded/meta-oe/recipes-extended/hplip/hplip-3.12.6/setup-add-sleep-after-cups-reset.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/hplip/hplip-3.12.6/setup-add-sleep-after-cups-reset.patch
rename to meta-openembedded/meta-oe/recipes-extended/hplip/hplip-3.12.6/setup-add-sleep-after-cups-reset.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb b/meta-openembedded/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb
rename to meta-openembedded/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/hwloc/hwloc_1.11.5.bb b/meta-openembedded/meta-oe/recipes-extended/hwloc/hwloc_1.11.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/hwloc/hwloc_1.11.5.bb
rename to meta-openembedded/meta-oe/recipes-extended/hwloc/hwloc_1.11.5.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/indent/indent_2.2.10.bb b/meta-openembedded/meta-oe/recipes-extended/indent/indent_2.2.10.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/indent/indent_2.2.10.bb
rename to meta-openembedded/meta-oe/recipes-extended/indent/indent_2.2.10.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/iotop/iotop_0.6.bb b/meta-openembedded/meta-oe/recipes-extended/iotop/iotop_0.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/iotop/iotop_0.6.bb
rename to meta-openembedded/meta-oe/recipes-extended/iotop/iotop_0.6.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/isomd5sum/files/0001-tweak-install-prefix.patch b/meta-openembedded/meta-oe/recipes-extended/isomd5sum/files/0001-tweak-install-prefix.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/isomd5sum/files/0001-tweak-install-prefix.patch
rename to meta-openembedded/meta-oe/recipes-extended/isomd5sum/files/0001-tweak-install-prefix.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/isomd5sum/files/0002-fix-parallel-error.patch b/meta-openembedded/meta-oe/recipes-extended/isomd5sum/files/0002-fix-parallel-error.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/isomd5sum/files/0002-fix-parallel-error.patch
rename to meta-openembedded/meta-oe/recipes-extended/isomd5sum/files/0002-fix-parallel-error.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.1.bb b/meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.1.bb
rename to meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/jansson/jansson_2.9.bb b/meta-openembedded/meta-oe/recipes-extended/jansson/jansson_2.9.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/jansson/jansson_2.9.bb
rename to meta-openembedded/meta-oe/recipes-extended/jansson/jansson_2.9.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-CMakeLists.txt-fix-lib64-can-not-be-shiped-in-64bit-.patch b/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-CMakeLists.txt-fix-lib64-can-not-be-shiped-in-64bit-.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-CMakeLists.txt-fix-lib64-can-not-be-shiped-in-64bit-.patch
rename to meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-CMakeLists.txt-fix-lib64-can-not-be-shiped-in-64bit-.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-drop-including-rpath-cmake-module.patch b/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-drop-including-rpath-cmake-module.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-drop-including-rpath-cmake-module.patch
rename to meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi/0001-drop-including-rpath-cmake-module.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb b/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb
rename to meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/lcdproc/lcdproc/0001-include-asm-ioctl.h-explicitly.patch b/meta-openembedded/meta-oe/recipes-extended/lcdproc/lcdproc/0001-include-asm-ioctl.h-explicitly.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/lcdproc/lcdproc/0001-include-asm-ioctl.h-explicitly.patch
rename to meta-openembedded/meta-oe/recipes-extended/lcdproc/lcdproc/0001-include-asm-ioctl.h-explicitly.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/lcdproc/lcdproc_git.bb b/meta-openembedded/meta-oe/recipes-extended/lcdproc/lcdproc_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/lcdproc/lcdproc_git.bb
rename to meta-openembedded/meta-oe/recipes-extended/lcdproc/lcdproc_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0001-fix-configure-and-compile-failures.patch b/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0001-fix-configure-and-compile-failures.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0001-fix-configure-and-compile-failures.patch
rename to meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0001-fix-configure-and-compile-failures.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0002-remove-python2-support.patch b/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0002-remove-python2-support.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0002-remove-python2-support.patch
rename to meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0002-remove-python2-support.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0003-remove-dmraid-while-compiling-with-with-dm.patch b/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0003-remove-dmraid-while-compiling-with-with-dm.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0003-remove-dmraid-while-compiling-with-with-dm.patch
rename to meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0003-remove-dmraid-while-compiling-with-with-dm.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0004-fix-compile-failure-against-musl-C-library.patch b/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0004-fix-compile-failure-against-musl-C-library.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0004-fix-compile-failure-against-musl-C-library.patch
rename to meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0004-fix-compile-failure-against-musl-C-library.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0005-fix-a-clang-compiling-issue.patch b/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0005-fix-a-clang-compiling-issue.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0005-fix-a-clang-compiling-issue.patch
rename to meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0005-fix-a-clang-compiling-issue.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.16.bb b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.16.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.16.bb
rename to meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.16.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libcec/files/python-install-location.patch b/meta-openembedded/meta-oe/recipes-extended/libcec/files/python-install-location.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libcec/files/python-install-location.patch
rename to meta-openembedded/meta-oe/recipes-extended/libcec/files/python-install-location.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_git.bb b/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libcec/libcec_git.bb
rename to meta-openembedded/meta-oe/recipes-extended/libcec/libcec_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libconfig/libconfig_1.5.bb b/meta-openembedded/meta-oe/recipes-extended/libconfig/libconfig_1.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libconfig/libconfig_1.5.bb
rename to meta-openembedded/meta-oe/recipes-extended/libconfig/libconfig_1.5.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libdivecomputer/files/fix-ar.patch b/meta-openembedded/meta-oe/recipes-extended/libdivecomputer/files/fix-ar.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libdivecomputer/files/fix-ar.patch
rename to meta-openembedded/meta-oe/recipes-extended/libdivecomputer/files/fix-ar.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb b/meta-openembedded/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb
rename to meta-openembedded/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libexecinfo/libexecinfo/0001-makefile-Fix-build-on-linux.patch b/meta-openembedded/meta-oe/recipes-extended/libexecinfo/libexecinfo/0001-makefile-Fix-build-on-linux.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libexecinfo/libexecinfo/0001-makefile-Fix-build-on-linux.patch
rename to meta-openembedded/meta-oe/recipes-extended/libexecinfo/libexecinfo/0001-makefile-Fix-build-on-linux.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libexecinfo/libexecinfo/0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch b/meta-openembedded/meta-oe/recipes-extended/libexecinfo/libexecinfo/0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libexecinfo/libexecinfo/0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch
rename to meta-openembedded/meta-oe/recipes-extended/libexecinfo/libexecinfo/0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libexecinfo/libexecinfo_1.1.bb b/meta-openembedded/meta-oe/recipes-extended/libexecinfo/libexecinfo_1.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libexecinfo/libexecinfo_1.1.bb
rename to meta-openembedded/meta-oe/recipes-extended/libexecinfo/libexecinfo_1.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libgxim/libgxim/0001-Use-AM_CPPFLAGS-instead-of-INCLUDES.patch b/meta-openembedded/meta-oe/recipes-extended/libgxim/libgxim/0001-Use-AM_CPPFLAGS-instead-of-INCLUDES.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libgxim/libgxim/0001-Use-AM_CPPFLAGS-instead-of-INCLUDES.patch
rename to meta-openembedded/meta-oe/recipes-extended/libgxim/libgxim/0001-Use-AM_CPPFLAGS-instead-of-INCLUDES.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libgxim/libgxim/0002-Update-autotools-macro.patch b/meta-openembedded/meta-oe/recipes-extended/libgxim/libgxim/0002-Update-autotools-macro.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libgxim/libgxim/0002-Update-autotools-macro.patch
rename to meta-openembedded/meta-oe/recipes-extended/libgxim/libgxim/0002-Update-autotools-macro.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libgxim/libgxim/0003-Add-format-string-qualifier-to-fix-potential-securit.patch b/meta-openembedded/meta-oe/recipes-extended/libgxim/libgxim/0003-Add-format-string-qualifier-to-fix-potential-securit.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libgxim/libgxim/0003-Add-format-string-qualifier-to-fix-potential-securit.patch
rename to meta-openembedded/meta-oe/recipes-extended/libgxim/libgxim/0003-Add-format-string-qualifier-to-fix-potential-securit.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libgxim/libgxim/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch b/meta-openembedded/meta-oe/recipes-extended/libgxim/libgxim/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libgxim/libgxim/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch
rename to meta-openembedded/meta-oe/recipes-extended/libgxim/libgxim/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb b/meta-openembedded/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb
rename to meta-openembedded/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/files/0001-Fix-warnings-found-with-clang.patch b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/files/0001-Fix-warnings-found-with-clang.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/files/0001-Fix-warnings-found-with-clang.patch
rename to meta-openembedded/meta-oe/recipes-extended/libimobiledevice/files/0001-Fix-warnings-found-with-clang.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/files/fix-parallel-make.patch b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/files/fix-parallel-make.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/files/fix-parallel-make.patch
rename to meta-openembedded/meta-oe/recipes-extended/libimobiledevice/files/fix-parallel-make.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_1.8.bb b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_1.8.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_1.8.bb
rename to meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_1.8.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/configure.patch b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/configure.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/configure.patch
rename to meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/configure.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/install.patch b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/install.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/install.patch
rename to meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/install.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/ldflags.patch b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/ldflags.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/ldflags.patch
rename to meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/ldflags.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-install-so-to-man-dir.patch b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-install-so-to-man-dir.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-install-so-to-man-dir.patch
rename to meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-install-so-to-man-dir.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-nfslib-and-soname.patch b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-nfslib-and-soname.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-nfslib-and-soname.patch
rename to meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-nfslib-and-soname.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb
rename to meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/liblogging/liblogging_1.0.5.bb b/meta-openembedded/meta-oe/recipes-extended/liblogging/liblogging_1.0.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/liblogging/liblogging_1.0.5.bb
rename to meta-openembedded/meta-oe/recipes-extended/liblogging/liblogging_1.0.5.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/liblognorm/liblognorm.inc b/meta-openembedded/meta-oe/recipes-extended/liblognorm/liblognorm.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/liblognorm/liblognorm.inc
rename to meta-openembedded/meta-oe/recipes-extended/liblognorm/liblognorm.inc
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/liblognorm/liblognorm_1.0.1.bb b/meta-openembedded/meta-oe/recipes-extended/liblognorm/liblognorm_1.0.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/liblognorm/liblognorm_1.0.1.bb
rename to meta-openembedded/meta-oe/recipes-extended/liblognorm/liblognorm_1.0.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus.inc b/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus.inc
rename to meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus.inc
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus_3.0.6.bb b/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus_3.0.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus_3.0.6.bb
rename to meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus_3.0.6.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.4.bb b/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.4.bb
rename to meta-openembedded/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.4.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch b/meta-openembedded/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch
rename to meta-openembedded/meta-oe/recipes-extended/libpwquality/files/add-missing-python-include-dir-for-cross.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.0.bb b/meta-openembedded/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.0.bb
rename to meta-openembedded/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libqb/libqb/0001-build-fix-configure-script-neglecting-re-enable-out-.patch b/meta-openembedded/meta-oe/recipes-extended/libqb/libqb/0001-build-fix-configure-script-neglecting-re-enable-out-.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libqb/libqb/0001-build-fix-configure-script-neglecting-re-enable-out-.patch
rename to meta-openembedded/meta-oe/recipes-extended/libqb/libqb/0001-build-fix-configure-script-neglecting-re-enable-out-.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libqb/libqb_1.0.3.bb b/meta-openembedded/meta-oe/recipes-extended/libqb/libqb_1.0.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libqb/libqb_1.0.3.bb
rename to meta-openembedded/meta-oe/recipes-extended/libqb/libqb_1.0.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libreport/files/0001-Makefile.am-remove-doc-and-apidoc.patch b/meta-openembedded/meta-oe/recipes-extended/libreport/files/0001-Makefile.am-remove-doc-and-apidoc.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libreport/files/0001-Makefile.am-remove-doc-and-apidoc.patch
rename to meta-openembedded/meta-oe/recipes-extended/libreport/files/0001-Makefile.am-remove-doc-and-apidoc.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libreport/files/0002-configure.ac-remove-prog-test-of-xmlto-and-asciidoc.patch b/meta-openembedded/meta-oe/recipes-extended/libreport/files/0002-configure.ac-remove-prog-test-of-xmlto-and-asciidoc.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libreport/files/0002-configure.ac-remove-prog-test-of-xmlto-and-asciidoc.patch
rename to meta-openembedded/meta-oe/recipes-extended/libreport/files/0002-configure.ac-remove-prog-test-of-xmlto-and-asciidoc.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libreport/files/0003-without-build-plugins.patch b/meta-openembedded/meta-oe/recipes-extended/libreport/files/0003-without-build-plugins.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libreport/files/0003-without-build-plugins.patch
rename to meta-openembedded/meta-oe/recipes-extended/libreport/files/0003-without-build-plugins.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libreport/files/0004-configure.ac-remove-prog-test-of-augparse.patch b/meta-openembedded/meta-oe/recipes-extended/libreport/files/0004-configure.ac-remove-prog-test-of-augparse.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libreport/files/0004-configure.ac-remove-prog-test-of-augparse.patch
rename to meta-openembedded/meta-oe/recipes-extended/libreport/files/0004-configure.ac-remove-prog-test-of-augparse.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libreport/files/0005-remove-python2-support.patch b/meta-openembedded/meta-oe/recipes-extended/libreport/files/0005-remove-python2-support.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libreport/files/0005-remove-python2-support.patch
rename to meta-openembedded/meta-oe/recipes-extended/libreport/files/0005-remove-python2-support.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.9.2.bb b/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.9.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.9.2.bb
rename to meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.9.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libuio/libuio/0001-include-fcntl.h-for-O_RDWR-define.patch b/meta-openembedded/meta-oe/recipes-extended/libuio/libuio/0001-include-fcntl.h-for-O_RDWR-define.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libuio/libuio/0001-include-fcntl.h-for-O_RDWR-define.patch
rename to meta-openembedded/meta-oe/recipes-extended/libuio/libuio/0001-include-fcntl.h-for-O_RDWR-define.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libuio/libuio/replace_inline_with_static-inline.patch b/meta-openembedded/meta-oe/recipes-extended/libuio/libuio/replace_inline_with_static-inline.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libuio/libuio/replace_inline_with_static-inline.patch
rename to meta-openembedded/meta-oe/recipes-extended/libuio/libuio/replace_inline_with_static-inline.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb b/meta-openembedded/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb
rename to meta-openembedded/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf/0001-configure-use-pkg-config-for-freetype.patch b/meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf/0001-configure-use-pkg-config-for-freetype.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf/0001-configure-use-pkg-config-for-freetype.patch
rename to meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf/0001-configure-use-pkg-config-for-freetype.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf/libwmf-0.2.8.4-intoverflow.patch b/meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf/libwmf-0.2.8.4-intoverflow.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf/libwmf-0.2.8.4-intoverflow.patch
rename to meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf/libwmf-0.2.8.4-intoverflow.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf/libwmf-0.2.8.4-useafterfree.patch b/meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf/libwmf-0.2.8.4-useafterfree.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf/libwmf-0.2.8.4-useafterfree.patch
rename to meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf/libwmf-0.2.8.4-useafterfree.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb b/meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb
rename to meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libx86-1/libx86-1.1/0001-assume-zero-is-valid-address.patch b/meta-openembedded/meta-oe/recipes-extended/libx86-1/libx86-1.1/0001-assume-zero-is-valid-address.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libx86-1/libx86-1.1/0001-assume-zero-is-valid-address.patch
rename to meta-openembedded/meta-oe/recipes-extended/libx86-1/libx86-1.1/0001-assume-zero-is-valid-address.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libx86-1/libx86-1.1/libx86-mmap-offset.patch b/meta-openembedded/meta-oe/recipes-extended/libx86-1/libx86-1.1/libx86-mmap-offset.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libx86-1/libx86-1.1/libx86-mmap-offset.patch
rename to meta-openembedded/meta-oe/recipes-extended/libx86-1/libx86-1.1/libx86-mmap-offset.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libx86-1/libx86-1.1/makefile-add-ldflags.patch b/meta-openembedded/meta-oe/recipes-extended/libx86-1/libx86-1.1/makefile-add-ldflags.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libx86-1/libx86-1.1/makefile-add-ldflags.patch
rename to meta-openembedded/meta-oe/recipes-extended/libx86-1/libx86-1.1/makefile-add-ldflags.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/libx86-1/libx86-1_1.1.bb b/meta-openembedded/meta-oe/recipes-extended/libx86-1/libx86-1_1.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/libx86-1/libx86-1_1.1.bb
rename to meta-openembedded/meta-oe/recipes-extended/libx86-1/libx86-1_1.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/lockfile-progs/lockfile-progs_0.1.17.bb b/meta-openembedded/meta-oe/recipes-extended/lockfile-progs/lockfile-progs_0.1.17.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/lockfile-progs/lockfile-progs_0.1.17.bb
rename to meta-openembedded/meta-oe/recipes-extended/lockfile-progs/lockfile-progs_0.1.17.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/logwatch/logwatch_7.4.3.bb b/meta-openembedded/meta-oe/recipes-extended/logwatch/logwatch_7.4.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/logwatch/logwatch_7.4.3.bb
rename to meta-openembedded/meta-oe/recipes-extended/logwatch/logwatch_7.4.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/lprng/lprng_3.8.C.bb b/meta-openembedded/meta-oe/recipes-extended/lprng/lprng_3.8.C.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/lprng/lprng_3.8.C.bb
rename to meta-openembedded/meta-oe/recipes-extended/lprng/lprng_3.8.C.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/0001-Don-t-reuse-weak-symbol-optopt-to-fix-FTBFS-on-mips.patch b/meta-openembedded/meta-oe/recipes-extended/mailx/files/0001-Don-t-reuse-weak-symbol-optopt-to-fix-FTBFS-on-mips.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/0001-Don-t-reuse-weak-symbol-optopt-to-fix-FTBFS-on-mips.patch
rename to meta-openembedded/meta-oe/recipes-extended/mailx/files/0001-Don-t-reuse-weak-symbol-optopt-to-fix-FTBFS-on-mips.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/0002-Patched-out-SSL2-support-since-it-is-no-longer-suppo.patch b/meta-openembedded/meta-oe/recipes-extended/mailx/files/0002-Patched-out-SSL2-support-since-it-is-no-longer-suppo.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/0002-Patched-out-SSL2-support-since-it-is-no-longer-suppo.patch
rename to meta-openembedded/meta-oe/recipes-extended/mailx/files/0002-Patched-out-SSL2-support-since-it-is-no-longer-suppo.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/0003-Fixed-Lintian-warning-warning-macro-N-not-defined.patch b/meta-openembedded/meta-oe/recipes-extended/mailx/files/0003-Fixed-Lintian-warning-warning-macro-N-not-defined.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/0003-Fixed-Lintian-warning-warning-macro-N-not-defined.patch
rename to meta-openembedded/meta-oe/recipes-extended/mailx/files/0003-Fixed-Lintian-warning-warning-macro-N-not-defined.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/0011-outof-Introduce-expandaddr-flag.patch b/meta-openembedded/meta-oe/recipes-extended/mailx/files/0011-outof-Introduce-expandaddr-flag.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/0011-outof-Introduce-expandaddr-flag.patch
rename to meta-openembedded/meta-oe/recipes-extended/mailx/files/0011-outof-Introduce-expandaddr-flag.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/0012-unpack-Disable-option-processing-for-email-addresses.patch b/meta-openembedded/meta-oe/recipes-extended/mailx/files/0012-unpack-Disable-option-processing-for-email-addresses.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/0012-unpack-Disable-option-processing-for-email-addresses.patch
rename to meta-openembedded/meta-oe/recipes-extended/mailx/files/0012-unpack-Disable-option-processing-for-email-addresses.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/0013-fio.c-Unconditionally-require-wordexp-support.patch b/meta-openembedded/meta-oe/recipes-extended/mailx/files/0013-fio.c-Unconditionally-require-wordexp-support.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/0013-fio.c-Unconditionally-require-wordexp-support.patch
rename to meta-openembedded/meta-oe/recipes-extended/mailx/files/0013-fio.c-Unconditionally-require-wordexp-support.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/0014-globname-Invoke-wordexp-with-WRDE_NOCMD.patch b/meta-openembedded/meta-oe/recipes-extended/mailx/files/0014-globname-Invoke-wordexp-with-WRDE_NOCMD.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/0014-globname-Invoke-wordexp-with-WRDE_NOCMD.patch
rename to meta-openembedded/meta-oe/recipes-extended/mailx/files/0014-globname-Invoke-wordexp-with-WRDE_NOCMD.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/0015-usr-sbin-sendmail.patch b/meta-openembedded/meta-oe/recipes-extended/mailx/files/0015-usr-sbin-sendmail.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/0015-usr-sbin-sendmail.patch
rename to meta-openembedded/meta-oe/recipes-extended/mailx/files/0015-usr-sbin-sendmail.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/explicitly.disable.krb5.support.patch b/meta-openembedded/meta-oe/recipes-extended/mailx/files/explicitly.disable.krb5.support.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/files/explicitly.disable.krb5.support.patch
rename to meta-openembedded/meta-oe/recipes-extended/mailx/files/explicitly.disable.krb5.support.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/mailx_12.5-5.bb b/meta-openembedded/meta-oe/recipes-extended/mailx/mailx_12.5-5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/mailx/mailx_12.5-5.bb
rename to meta-openembedded/meta-oe/recipes-extended/mailx/mailx_12.5-5.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/md5deep/files/0001-Fix-errors-found-by-clang.patch b/meta-openembedded/meta-oe/recipes-extended/md5deep/files/0001-Fix-errors-found-by-clang.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/md5deep/files/0001-Fix-errors-found-by-clang.patch
rename to meta-openembedded/meta-oe/recipes-extended/md5deep/files/0001-Fix-errors-found-by-clang.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/md5deep/files/wrong-variable-expansion.patch b/meta-openembedded/meta-oe/recipes-extended/md5deep/files/wrong-variable-expansion.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/md5deep/files/wrong-variable-expansion.patch
rename to meta-openembedded/meta-oe/recipes-extended/md5deep/files/wrong-variable-expansion.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/md5deep/md5deep_4.4.bb b/meta-openembedded/meta-oe/recipes-extended/md5deep/md5deep_4.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/md5deep/md5deep_4.4.bb
rename to meta-openembedded/meta-oe/recipes-extended/md5deep/md5deep_4.4.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/0001-include-cstdio-to-get-printf-definitions.patch b/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/0001-include-cstdio-to-get-printf-definitions.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/0001-include-cstdio-to-get-printf-definitions.patch
rename to meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/0001-include-cstdio-to-get-printf-definitions.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/0002-configure.ac-header-detection-of-hash_map-is-broken-.patch b/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/0002-configure.ac-header-detection-of-hash_map-is-broken-.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/0002-configure.ac-header-detection-of-hash_map-is-broken-.patch
rename to meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/0002-configure.ac-header-detection-of-hash_map-is-broken-.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/0003-gcc-6.0-build-fixes.patch b/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/0003-gcc-6.0-build-fixes.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/0003-gcc-6.0-build-fixes.patch
rename to meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/0003-gcc-6.0-build-fixes.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/use_hostcxx.patch b/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/use_hostcxx.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/use_hostcxx.patch
rename to meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview/use_hostcxx.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb b/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb
rename to meta-openembedded/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-compare-the-first-character-of-string-to-be-null-or-.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-compare-the-first-character-of-string-to-be-null-or-.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-compare-the-first-character-of-string-to-be-null-or-.patch
rename to meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-compare-the-first-character-of-string-to-be-null-or-.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch
rename to meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-mozjs17.0.0-fix-the-compile-bug-of-powerpc.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-mozjs17.0.0-fix-the-compile-bug-of-powerpc.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-mozjs17.0.0-fix-the-compile-bug-of-powerpc.patch
rename to meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-mozjs17.0.0-fix-the-compile-bug-of-powerpc.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-regenerate-configure.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-regenerate-configure.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-regenerate-configure.patch
rename to meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0001-regenerate-configure.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0002-Move-JS_BYTES_PER_WORD-out-of-config.h.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0002-Move-JS_BYTES_PER_WORD-out-of-config.h.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0002-Move-JS_BYTES_PER_WORD-out-of-config.h.patch
rename to meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0002-Move-JS_BYTES_PER_WORD-out-of-config.h.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0003-Add-AArch64-support.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0003-Add-AArch64-support.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0003-Add-AArch64-support.patch
rename to meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0003-Add-AArch64-support.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0004-mozbug746112-no-decommit-on-large-pages.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0004-mozbug746112-no-decommit-on-large-pages.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0004-mozbug746112-no-decommit-on-large-pages.patch
rename to meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0004-mozbug746112-no-decommit-on-large-pages.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0005-aarch64-64k-page.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0005-aarch64-64k-page.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0005-aarch64-64k-page.patch
rename to meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0005-aarch64-64k-page.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0010-fix-cross-compilation-on-i586-targets.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0010-fix-cross-compilation-on-i586-targets.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0010-fix-cross-compilation-on-i586-targets.patch
rename to meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/0010-fix-cross-compilation-on-i586-targets.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/Manually_mmap_heap_memory_esr17.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/Manually_mmap_heap_memory_esr17.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/Manually_mmap_heap_memory_esr17.patch
rename to meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/Manually_mmap_heap_memory_esr17.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/fix-the-compile-error-of-powerpc64.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/fix-the-compile-error-of-powerpc64.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/fix-the-compile-error-of-powerpc64.patch
rename to meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/fix-the-compile-error-of-powerpc64.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/fix_milestone_compile_issue.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/fix_milestone_compile_issue.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/fix_milestone_compile_issue.patch
rename to meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs/fix_milestone_compile_issue.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_17.0.0.bb b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_17.0.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_17.0.0.bb
rename to meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_17.0.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb
rename to meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/nana/nana/change-mandir-to-DESTDIR.patch b/meta-openembedded/meta-oe/recipes-extended/nana/nana/change-mandir-to-DESTDIR.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/nana/nana/change-mandir-to-DESTDIR.patch
rename to meta-openembedded/meta-oe/recipes-extended/nana/nana/change-mandir-to-DESTDIR.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/nana/nana/modify-acinclude.m4-and-configure.in.patch b/meta-openembedded/meta-oe/recipes-extended/nana/nana/modify-acinclude.m4-and-configure.in.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/nana/nana/modify-acinclude.m4-and-configure.in.patch
rename to meta-openembedded/meta-oe/recipes-extended/nana/nana/modify-acinclude.m4-and-configure.in.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/nana/nana_2.5.bb b/meta-openembedded/meta-oe/recipes-extended/nana/nana_2.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/nana/nana_2.5.bb
rename to meta-openembedded/meta-oe/recipes-extended/nana/nana_2.5.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/nicstat/nicstat/0001-nicstat.c-Do-not-define-uint64_t-and-uint32_t.patch b/meta-openembedded/meta-oe/recipes-extended/nicstat/nicstat/0001-nicstat.c-Do-not-define-uint64_t-and-uint32_t.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/nicstat/nicstat/0001-nicstat.c-Do-not-define-uint64_t-and-uint32_t.patch
rename to meta-openembedded/meta-oe/recipes-extended/nicstat/nicstat/0001-nicstat.c-Do-not-define-uint64_t-and-uint32_t.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/nicstat/nicstat_1.95.bb b/meta-openembedded/meta-oe/recipes-extended/nicstat/nicstat_1.95.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/nicstat/nicstat_1.95.bb
rename to meta-openembedded/meta-oe/recipes-extended/nicstat/nicstat_1.95.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb b/meta-openembedded/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb
rename to meta-openembedded/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman/0001-lock.c-Define-PTHREAD_MUTEX_RECURSIVE_NP-if-undefine.patch b/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman/0001-lock.c-Define-PTHREAD_MUTEX_RECURSIVE_NP-if-undefine.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman/0001-lock.c-Define-PTHREAD_MUTEX_RECURSIVE_NP-if-undefine.patch
rename to meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman/0001-lock.c-Define-PTHREAD_MUTEX_RECURSIVE_NP-if-undefine.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman/libssl-is-required-if-eventint-supported.patch b/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman/libssl-is-required-if-eventint-supported.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman/libssl-is-required-if-eventint-supported.patch
rename to meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman/libssl-is-required-if-eventint-supported.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman/openwsmand.service b/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman/openwsmand.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman/openwsmand.service
rename to meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman/openwsmand.service
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.3.bb b/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.3.bb
rename to meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/p7zip/files/0001-Fix-narrowing-errors-Wc-11-narrowing.patch b/meta-openembedded/meta-oe/recipes-extended/p7zip/files/0001-Fix-narrowing-errors-Wc-11-narrowing.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/p7zip/files/0001-Fix-narrowing-errors-Wc-11-narrowing.patch
rename to meta-openembedded/meta-oe/recipes-extended/p7zip/files/0001-Fix-narrowing-errors-Wc-11-narrowing.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/p7zip/files/CVE-2017-17969.patch b/meta-openembedded/meta-oe/recipes-extended/p7zip/files/CVE-2017-17969.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/p7zip/files/CVE-2017-17969.patch
rename to meta-openembedded/meta-oe/recipes-extended/p7zip/files/CVE-2017-17969.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/p7zip/files/do_not_override_compiler_and_do_not_strip.patch b/meta-openembedded/meta-oe/recipes-extended/p7zip/files/do_not_override_compiler_and_do_not_strip.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/p7zip/files/do_not_override_compiler_and_do_not_strip.patch
rename to meta-openembedded/meta-oe/recipes-extended/p7zip/files/do_not_override_compiler_and_do_not_strip.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb b/meta-openembedded/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb
rename to meta-openembedded/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/p8platform/p8platform_git.bb b/meta-openembedded/meta-oe/recipes-extended/p8platform/p8platform_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/p8platform/p8platform_git.bb
rename to meta-openembedded/meta-oe/recipes-extended/p8platform/p8platform_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb b/meta-openembedded/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb
rename to meta-openembedded/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/perl/libfile-fnmatch-perl_0.02.bb b/meta-openembedded/meta-oe/recipes-extended/perl/libfile-fnmatch-perl_0.02.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/perl/libfile-fnmatch-perl_0.02.bb
rename to meta-openembedded/meta-oe/recipes-extended/perl/libfile-fnmatch-perl_0.02.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/polkit/files/50-org.freedesktop.NetworkManager.rules b/meta-openembedded/meta-oe/recipes-extended/polkit/files/50-org.freedesktop.NetworkManager.rules
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/polkit/files/50-org.freedesktop.NetworkManager.rules
rename to meta-openembedded/meta-oe/recipes-extended/polkit/files/50-org.freedesktop.NetworkManager.rules
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/polkit/files/50-org.freedesktop.timedate1.rules b/meta-openembedded/meta-oe/recipes-extended/polkit/files/50-org.freedesktop.timedate1.rules
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/polkit/files/50-org.freedesktop.timedate1.rules
rename to meta-openembedded/meta-oe/recipes-extended/polkit/files/50-org.freedesktop.timedate1.rules
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb
rename to meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb
rename to meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule.inc b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule.inc
rename to meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule.inc
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/0001-make-netgroup-support-configurable.patch b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/0001-make-netgroup-support-configurable.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/0001-make-netgroup-support-configurable.patch
rename to meta-openembedded/meta-oe/recipes-extended/polkit/polkit/0001-make-netgroup-support-configurable.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/polkit-1_pam.patch b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/polkit-1_pam.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/polkit/polkit/polkit-1_pam.patch
rename to meta-openembedded/meta-oe/recipes-extended/polkit/polkit/polkit-1_pam.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.113.bb b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.113.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.113.bb
rename to meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.113.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/rarpd/rarpd/0001-rarpd.8-add-man-file.patch b/meta-openembedded/meta-oe/recipes-extended/rarpd/rarpd/0001-rarpd.8-add-man-file.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/rarpd/rarpd/0001-rarpd.8-add-man-file.patch
rename to meta-openembedded/meta-oe/recipes-extended/rarpd/rarpd/0001-rarpd.8-add-man-file.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/rarpd/rarpd/0002-Makefile-modify-compile-parameters.patch b/meta-openembedded/meta-oe/recipes-extended/rarpd/rarpd/0002-Makefile-modify-compile-parameters.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/rarpd/rarpd/0002-Makefile-modify-compile-parameters.patch
rename to meta-openembedded/meta-oe/recipes-extended/rarpd/rarpd/0002-Makefile-modify-compile-parameters.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/rarpd/rarpd/0003-rarpd.c-bug-fix.patch b/meta-openembedded/meta-oe/recipes-extended/rarpd/rarpd/0003-rarpd.c-bug-fix.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/rarpd/rarpd/0003-rarpd.c-bug-fix.patch
rename to meta-openembedded/meta-oe/recipes-extended/rarpd/rarpd/0003-rarpd.c-bug-fix.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/rarpd/rarpd/0004-rarpd.init-add-new-init-file.patch b/meta-openembedded/meta-oe/recipes-extended/rarpd/rarpd/0004-rarpd.init-add-new-init-file.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/rarpd/rarpd/0004-rarpd.init-add-new-init-file.patch
rename to meta-openembedded/meta-oe/recipes-extended/rarpd/rarpd/0004-rarpd.init-add-new-init-file.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/rarpd/rarpd/0005-ethernet.c-remove-it.patch b/meta-openembedded/meta-oe/recipes-extended/rarpd/rarpd/0005-ethernet.c-remove-it.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/rarpd/rarpd/0005-ethernet.c-remove-it.patch
rename to meta-openembedded/meta-oe/recipes-extended/rarpd/rarpd/0005-ethernet.c-remove-it.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/rarpd/rarpd/ethers.sample b/meta-openembedded/meta-oe/recipes-extended/rarpd/rarpd/ethers.sample
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/rarpd/rarpd/ethers.sample
rename to meta-openembedded/meta-oe/recipes-extended/rarpd/rarpd/ethers.sample
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/rarpd/rarpd/rarpd.service b/meta-openembedded/meta-oe/recipes-extended/rarpd/rarpd/rarpd.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/rarpd/rarpd/rarpd.service
rename to meta-openembedded/meta-oe/recipes-extended/rarpd/rarpd/rarpd.service
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb b/meta-openembedded/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb
rename to meta-openembedded/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/redis/redis/hiredis-update-Makefile-to-add-symbols-to-staticlib.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis/hiredis-update-Makefile-to-add-symbols-to-staticlib.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/redis/redis/hiredis-update-Makefile-to-add-symbols-to-staticlib.patch
rename to meta-openembedded/meta-oe/recipes-extended/redis/redis/hiredis-update-Makefile-to-add-symbols-to-staticlib.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch
rename to meta-openembedded/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/redis/redis/init-redis-server b/meta-openembedded/meta-oe/recipes-extended/redis/redis/init-redis-server
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/redis/redis/init-redis-server
rename to meta-openembedded/meta-oe/recipes-extended/redis/redis/init-redis-server
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch
rename to meta-openembedded/meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/redis/redis/oe-use-libc-malloc.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis/oe-use-libc-malloc.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/redis/redis/oe-use-libc-malloc.patch
rename to meta-openembedded/meta-oe/recipes-extended/redis/redis/oe-use-libc-malloc.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/redis/redis/redis.conf b/meta-openembedded/meta-oe/recipes-extended/redis/redis/redis.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/redis/redis/redis.conf
rename to meta-openembedded/meta-oe/recipes-extended/redis/redis/redis.conf
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/redis/redis/redis.service b/meta-openembedded/meta-oe/recipes-extended/redis/redis/redis.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/redis/redis/redis.service
rename to meta-openembedded/meta-oe/recipes-extended/redis/redis/redis.service
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/redis/redis_3.0.2.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_3.0.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/redis/redis_3.0.2.bb
rename to meta-openembedded/meta-oe/recipes-extended/redis/redis_3.0.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.6.0.bb b/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.6.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.6.0.bb
rename to meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.6.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/libfastjson_0.99.4.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/libfastjson_0.99.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/libfastjson_0.99.4.bb
rename to meta-openembedded/meta-oe/recipes-extended/rsyslog/libfastjson_0.99.4.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.2.14.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.2.14.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.2.14.bb
rename to meta-openembedded/meta-oe/recipes-extended/rsyslog/librelp_1.2.14.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Include-sys-time-h.patch b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Include-sys-time-h.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Include-sys-time-h.patch
rename to meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-Include-sys-time-h.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/initscript b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/initscript
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/initscript
rename to meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/initscript
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog-fix-ptest-not-finish.patch b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog-fix-ptest-not-finish.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog-fix-ptest-not-finish.patch
rename to meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog-fix-ptest-not-finish.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.conf b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.conf
rename to meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.conf
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate
rename to meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/run-ptest b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/run-ptest
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/run-ptest
rename to meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/run-ptest
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch
rename to meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.29.0.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.29.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.29.0.bb
rename to meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.29.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-cmpi-devel/sblim-cmpi-devel/sblim-cmpi-devel-2.0.3-docdir.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-cmpi-devel/sblim-cmpi-devel/sblim-cmpi-devel-2.0.3-docdir.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-cmpi-devel/sblim-cmpi-devel/sblim-cmpi-devel-2.0.3-docdir.patch
rename to meta-openembedded/meta-oe/recipes-extended/sblim-cmpi-devel/sblim-cmpi-devel/sblim-cmpi-devel-2.0.3-docdir.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-cmpi-devel/sblim-cmpi-devel_2.0.3.bb b/meta-openembedded/meta-oe/recipes-extended/sblim-cmpi-devel/sblim-cmpi-devel_2.0.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-cmpi-devel/sblim-cmpi-devel_2.0.3.bb
rename to meta-openembedded/meta-oe/recipes-extended/sblim-cmpi-devel/sblim-cmpi-devel_2.0.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-sfc-common/sblim-sfc-common_1.0.1.bb b/meta-openembedded/meta-oe/recipes-extended/sblim-sfc-common/sblim-sfc-common_1.0.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-sfc-common/sblim-sfc-common_1.0.1.bb
rename to meta-openembedded/meta-oe/recipes-extended/sblim-sfc-common/sblim-sfc-common_1.0.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/files/sfcb.service b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/files/sfcb.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/files/sfcb.service
rename to meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/files/sfcb.service
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/0001-Replace-need-for-error.h-when-it-does-not-exist.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/0001-Replace-need-for-error.h-when-it-does-not-exist.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/0001-Replace-need-for-error.h-when-it-does-not-exist.patch
rename to meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/0001-Replace-need-for-error.h-when-it-does-not-exist.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/0001-include-stdint.h-system-header-for-UINT16_MAX.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/0001-include-stdint.h-system-header-for-UINT16_MAX.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/0001-include-stdint.h-system-header-for-UINT16_MAX.patch
rename to meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/0001-include-stdint.h-system-header-for-UINT16_MAX.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.3.15-fix-provider-debugging.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.3.15-fix-provider-debugging.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.3.15-fix-provider-debugging.patch
rename to meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.3.15-fix-provider-debugging.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.3.16-maxMsgLen.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.3.16-maxMsgLen.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.3.16-maxMsgLen.patch
rename to meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.3.16-maxMsgLen.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.3.16-multilib-man-cfg.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.3.16-multilib-man-cfg.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.3.16-multilib-man-cfg.patch
rename to meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.3.16-multilib-man-cfg.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch
rename to meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.4.5-service.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.4.5-service.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.4.5-service.patch
rename to meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.4.5-service.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.4.8-default-ecdh-curve-name.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.4.8-default-ecdh-curve-name.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.4.8-default-ecdh-curve-name.patch
rename to meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.4.8-default-ecdh-curve-name.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.4.9-fix-ftbfs.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.4.9-fix-ftbfs.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.4.9-fix-ftbfs.patch
rename to meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb-1.4.9/sblim-sfcb-1.4.9-fix-ftbfs.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb
rename to meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc/0001-cimxml-Include-sys-select.h-for-fd_set.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc/0001-cimxml-Include-sys-select.h-for-fd_set.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc/0001-cimxml-Include-sys-select.h-for-fd_set.patch
rename to meta-openembedded/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc/0001-cimxml-Include-sys-select.h-for-fd_set.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc_2.2.8.bb b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc_2.2.8.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc_2.2.8.bb
rename to meta-openembedded/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc_2.2.8.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools/mdadm.patch b/meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools/mdadm.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools/mdadm.patch
rename to meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools/mdadm.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools/print-format.patch b/meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools/print-format.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools/print-format.patch
rename to meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools/print-format.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb b/meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb
rename to meta-openembedded/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/sgpio/sgpio/0001-makefile-Add-LDFLAGS-to-linking-rule.patch b/meta-openembedded/meta-oe/recipes-extended/sgpio/sgpio/0001-makefile-Add-LDFLAGS-to-linking-rule.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/sgpio/sgpio/0001-makefile-Add-LDFLAGS-to-linking-rule.patch
rename to meta-openembedded/meta-oe/recipes-extended/sgpio/sgpio/0001-makefile-Add-LDFLAGS-to-linking-rule.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/sgpio/sgpio/Makefile-error-fix.patch b/meta-openembedded/meta-oe/recipes-extended/sgpio/sgpio/Makefile-error-fix.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/sgpio/sgpio/Makefile-error-fix.patch
rename to meta-openembedded/meta-oe/recipes-extended/sgpio/sgpio/Makefile-error-fix.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb b/meta-openembedded/meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb
rename to meta-openembedded/meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/smartmontools/files/initd.smartd b/meta-openembedded/meta-oe/recipes-extended/smartmontools/files/initd.smartd
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/smartmontools/files/initd.smartd
rename to meta-openembedded/meta-oe/recipes-extended/smartmontools/files/initd.smartd
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/smartmontools/files/smartd.service b/meta-openembedded/meta-oe/recipes-extended/smartmontools/files/smartd.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/smartmontools/files/smartd.service
rename to meta-openembedded/meta-oe/recipes-extended/smartmontools/files/smartd.service
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/smartmontools/files/smartmontools.default b/meta-openembedded/meta-oe/recipes-extended/smartmontools/files/smartmontools.default
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/smartmontools/files/smartmontools.default
rename to meta-openembedded/meta-oe/recipes-extended/smartmontools/files/smartmontools.default
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/smartmontools/smartmontools_6.6.bb b/meta-openembedded/meta-oe/recipes-extended/smartmontools/smartmontools_6.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/smartmontools/smartmontools_6.6.bb
rename to meta-openembedded/meta-oe/recipes-extended/smartmontools/smartmontools_6.6.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb
rename to meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb
rename to meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/socketcan/canutils/0001-canutils-candump-Add-error-frame-s-handling.patch b/meta-openembedded/meta-oe/recipes-extended/socketcan/canutils/0001-canutils-candump-Add-error-frame-s-handling.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/socketcan/canutils/0001-canutils-candump-Add-error-frame-s-handling.patch
rename to meta-openembedded/meta-oe/recipes-extended/socketcan/canutils/0001-canutils-candump-Add-error-frame-s-handling.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb b/meta-openembedded/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb
rename to meta-openembedded/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.10.bb b/meta-openembedded/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.10.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.10.bb
rename to meta-openembedded/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.10.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig/0001-Fix-build-with-musl-backtrace-APIs-are-glibc-specifi.patch b/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig/0001-Fix-build-with-musl-backtrace-APIs-are-glibc-specifi.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig/0001-Fix-build-with-musl-backtrace-APIs-are-glibc-specifi.patch
rename to meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig/0001-Fix-build-with-musl-backtrace-APIs-are-glibc-specifi.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig/0001-libsinsp-Port-to-build-with-lua-5.2.patch b/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig/0001-libsinsp-Port-to-build-with-lua-5.2.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig/0001-libsinsp-Port-to-build-with-lua-5.2.patch
rename to meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig/0001-libsinsp-Port-to-build-with-lua-5.2.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_git.bb b/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_git.bb
rename to meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/configure.patch b/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/configure.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/configure.patch
rename to meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/configure.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/format_security.patch b/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/format_security.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/format_security.patch
rename to meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/format_security.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/libtool.patch b/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/libtool.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/libtool.patch
rename to meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/libtool.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib_5.1.2.bb b/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib_5.1.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib_5.1.2.bb
rename to meta-openembedded/meta-oe/recipes-extended/t1lib/t1lib_5.1.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils/0001-include-sys-select.h-for-FD_-definitions.patch b/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils/0001-include-sys-select.h-for-FD_-definitions.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils/0001-include-sys-select.h-for-FD_-definitions.patch
rename to meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils/0001-include-sys-select.h-for-FD_-definitions.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils/0001-multicast_blast-tipcc-Fix-struct-type-for-TIPC_GROUP.patch b/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils/0001-multicast_blast-tipcc-Fix-struct-type-for-TIPC_GROUP.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils/0001-multicast_blast-tipcc-Fix-struct-type-for-TIPC_GROUP.patch
rename to meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils/0001-multicast_blast-tipcc-Fix-struct-type-for-TIPC_GROUP.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils/0002-replace-non-standard-uint-with-unsigned-int.patch b/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils/0002-replace-non-standard-uint-with-unsigned-int.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils/0002-replace-non-standard-uint-with-unsigned-int.patch
rename to meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils/0002-replace-non-standard-uint-with-unsigned-int.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb b/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb
rename to meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/tiptop/tiptop_2.3.1.bb b/meta-openembedded/meta-oe/recipes-extended/tiptop/tiptop_2.3.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/tiptop/tiptop_2.3.1.bb
rename to meta-openembedded/meta-oe/recipes-extended/tiptop/tiptop_2.3.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/tmux/tmux_2.6.bb b/meta-openembedded/meta-oe/recipes-extended/tmux/tmux_2.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/tmux/tmux_2.6.bb
rename to meta-openembedded/meta-oe/recipes-extended/tmux/tmux_2.6.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/0001-include-required-system-header-files-for-fd_set-and-.patch b/meta-openembedded/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/0001-include-required-system-header-files-for-fd_set-and-.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/0001-include-required-system-header-files-for-fd_set-and-.patch
rename to meta-openembedded/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/0001-include-required-system-header-files-for-fd_set-and-.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/fix-ldflags.patch b/meta-openembedded/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/fix-ldflags.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/fix-ldflags.patch
rename to meta-openembedded/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/fix-ldflags.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/unstrip.patch b/meta-openembedded/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/unstrip.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/unstrip.patch
rename to meta-openembedded/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/unstrip.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb b/meta-openembedded/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb
rename to meta-openembedded/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb b/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb
rename to meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/vlock/vlock-2.2.3/disable_vlockrc.patch b/meta-openembedded/meta-oe/recipes-extended/vlock/vlock-2.2.3/disable_vlockrc.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/vlock/vlock-2.2.3/disable_vlockrc.patch
rename to meta-openembedded/meta-oe/recipes-extended/vlock/vlock-2.2.3/disable_vlockrc.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/vlock/vlock-2.2.3/vlock-no_tally.patch b/meta-openembedded/meta-oe/recipes-extended/vlock/vlock-2.2.3/vlock-no_tally.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/vlock/vlock-2.2.3/vlock-no_tally.patch
rename to meta-openembedded/meta-oe/recipes-extended/vlock/vlock-2.2.3/vlock-no_tally.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/vlock/vlock-2.2.3/vlock_pam b/meta-openembedded/meta-oe/recipes-extended/vlock/vlock-2.2.3/vlock_pam
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/vlock/vlock-2.2.3/vlock_pam
rename to meta-openembedded/meta-oe/recipes-extended/vlock/vlock-2.2.3/vlock_pam
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/vlock/vlock-2.2.3/vlock_pam_tally2_reset.patch b/meta-openembedded/meta-oe/recipes-extended/vlock/vlock-2.2.3/vlock_pam_tally2_reset.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/vlock/vlock-2.2.3/vlock_pam_tally2_reset.patch
rename to meta-openembedded/meta-oe/recipes-extended/vlock/vlock-2.2.3/vlock_pam_tally2_reset.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/vlock/vlock_2.2.3.bb b/meta-openembedded/meta-oe/recipes-extended/vlock/vlock_2.2.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/vlock/vlock_2.2.3.bb
rename to meta-openembedded/meta-oe/recipes-extended/vlock/vlock_2.2.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/volume_key/files/0001-explicitly-support-python3-by-pkg-config.patch b/meta-openembedded/meta-oe/recipes-extended/volume_key/files/0001-explicitly-support-python3-by-pkg-config.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/volume_key/files/0001-explicitly-support-python3-by-pkg-config.patch
rename to meta-openembedded/meta-oe/recipes-extended/volume_key/files/0001-explicitly-support-python3-by-pkg-config.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/volume_key/volume-key_0.3.9.bb b/meta-openembedded/meta-oe/recipes-extended/volume_key/volume-key_0.3.9.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/volume_key/volume-key_0.3.9.bb
rename to meta-openembedded/meta-oe/recipes-extended/volume_key/volume-key_0.3.9.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/wipe/files/makefile-add-ldflags.patch b/meta-openembedded/meta-oe/recipes-extended/wipe/files/makefile-add-ldflags.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/wipe/files/makefile-add-ldflags.patch
rename to meta-openembedded/meta-oe/recipes-extended/wipe/files/makefile-add-ldflags.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/wipe/files/support-cross-compile-for-linux.patch b/meta-openembedded/meta-oe/recipes-extended/wipe/files/support-cross-compile-for-linux.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/wipe/files/support-cross-compile-for-linux.patch
rename to meta-openembedded/meta-oe/recipes-extended/wipe/files/support-cross-compile-for-linux.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/wipe/wipe_git.bb b/meta-openembedded/meta-oe/recipes-extended/wipe/wipe_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/wipe/wipe_git.bb
rename to meta-openembedded/meta-oe/recipes-extended/wipe/wipe_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/zlog/zlog/0001-event.c-Cast-pthread_t-to-unsigned-long-instead-of-u.patch b/meta-openembedded/meta-oe/recipes-extended/zlog/zlog/0001-event.c-Cast-pthread_t-to-unsigned-long-instead-of-u.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/zlog/zlog/0001-event.c-Cast-pthread_t-to-unsigned-long-instead-of-u.patch
rename to meta-openembedded/meta-oe/recipes-extended/zlog/zlog/0001-event.c-Cast-pthread_t-to-unsigned-long-instead-of-u.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_git.bb b/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_git.bb
rename to meta-openembedded/meta-oe/recipes-extended/zlog/zlog_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/zram/zram/init b/meta-openembedded/meta-oe/recipes-extended/zram/zram/init
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/zram/zram/init
rename to meta-openembedded/meta-oe/recipes-extended/zram/zram/init
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/zram/zram/zram.service b/meta-openembedded/meta-oe/recipes-extended/zram/zram/zram.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/zram/zram/zram.service
rename to meta-openembedded/meta-oe/recipes-extended/zram/zram/zram.service
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-extended/zram/zram_0.1.bb b/meta-openembedded/meta-oe/recipes-extended/zram/zram_0.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-extended/zram/zram_0.1.bb
rename to meta-openembedded/meta-oe/recipes-extended/zram/zram_0.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-gnome/atk/atkmm_2.24.2.bb b/meta-openembedded/meta-oe/recipes-gnome/atk/atkmm_2.24.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-gnome/atk/atkmm_2.24.2.bb
rename to meta-openembedded/meta-oe/recipes-gnome/atk/atkmm_2.24.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-gnome/gnome-common/gnome-common_3.18.0.bb b/meta-openembedded/meta-oe/recipes-gnome/gnome-common/gnome-common_3.18.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-gnome/gnome-common/gnome-common_3.18.0.bb
rename to meta-openembedded/meta-oe/recipes-gnome/gnome-common/gnome-common_3.18.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-gnome/gnome-doc-utils-stub/files/gnome-doc-utils.m4 b/meta-openembedded/meta-oe/recipes-gnome/gnome-doc-utils-stub/files/gnome-doc-utils.m4
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-gnome/gnome-doc-utils-stub/files/gnome-doc-utils.m4
rename to meta-openembedded/meta-oe/recipes-gnome/gnome-doc-utils-stub/files/gnome-doc-utils.m4
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb b/meta-openembedded/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb
rename to meta-openembedded/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-gnome/gtk+/files/0001-do-not-build-demos.patch b/meta-openembedded/meta-oe/recipes-gnome/gtk+/files/0001-do-not-build-demos.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-gnome/gtk+/files/0001-do-not-build-demos.patch
rename to meta-openembedded/meta-oe/recipes-gnome/gtk+/files/0001-do-not-build-demos.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm3_3.22.2.bb b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm3_3.22.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm3_3.22.2.bb
rename to meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm3_3.22.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm_2.24.5.bb b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm_2.24.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm_2.24.5.bb
rename to meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm_2.24.5.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-gnome/vte9/vte9.inc b/meta-openembedded/meta-oe/recipes-gnome/vte9/vte9.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-gnome/vte9/vte9.inc
rename to meta-openembedded/meta-oe/recipes-gnome/vte9/vte9.inc
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-gnome/vte9/vte9/cve-2012-2738.patch b/meta-openembedded/meta-oe/recipes-gnome/vte9/vte9/cve-2012-2738.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-gnome/vte9/vte9/cve-2012-2738.patch
rename to meta-openembedded/meta-oe/recipes-gnome/vte9/vte9/cve-2012-2738.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-gnome/vte9/vte9/obsolete_automake_macros.patch b/meta-openembedded/meta-oe/recipes-gnome/vte9/vte9/obsolete_automake_macros.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-gnome/vte9/vte9/obsolete_automake_macros.patch
rename to meta-openembedded/meta-oe/recipes-gnome/vte9/vte9/obsolete_automake_macros.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-gnome/vte9/vte9_0.28.2.bb b/meta-openembedded/meta-oe/recipes-gnome/vte9/vte9_0.28.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-gnome/vte9/vte9_0.28.2.bb
rename to meta-openembedded/meta-oe/recipes-gnome/vte9/vte9_0.28.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/babl/babl_0.1.28.bb b/meta-openembedded/meta-oe/recipes-graphics/babl/babl_0.1.28.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/babl/babl_0.1.28.bb
rename to meta-openembedded/meta-oe/recipes-graphics/babl/babl_0.1.28.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/cairo/cairomm_1.12.0.bb b/meta-openembedded/meta-oe/recipes-graphics/cairo/cairomm_1.12.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/cairo/cairomm_1.12.0.bb
rename to meta-openembedded/meta-oe/recipes-graphics/cairo/cairomm_1.12.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/dietsplash/dietsplash/0001-configure.ac-Do-not-demand-linker-hash-style.patch b/meta-openembedded/meta-oe/recipes-graphics/dietsplash/dietsplash/0001-configure.ac-Do-not-demand-linker-hash-style.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/dietsplash/dietsplash/0001-configure.ac-Do-not-demand-linker-hash-style.patch
rename to meta-openembedded/meta-oe/recipes-graphics/dietsplash/dietsplash/0001-configure.ac-Do-not-demand-linker-hash-style.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/dietsplash/dietsplash_git.bb b/meta-openembedded/meta-oe/recipes-graphics/dietsplash/dietsplash_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/dietsplash/dietsplash_git.bb
rename to meta-openembedded/meta-oe/recipes-graphics/dietsplash/dietsplash_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb-examples/configure.in-Fix-string-argument-syntax.patch b/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb-examples/configure.in-Fix-string-argument-syntax.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb-examples/configure.in-Fix-string-argument-syntax.patch
rename to meta-openembedded/meta-oe/recipes-graphics/directfb/directfb-examples/configure.in-Fix-string-argument-syntax.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb-examples_1.7.0.bb b/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb-examples_1.7.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb-examples_1.7.0.bb
rename to meta-openembedded/meta-oe/recipes-graphics/directfb/directfb-examples_1.7.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb.inc b/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb.inc
rename to meta-openembedded/meta-oe/recipes-graphics/directfb/directfb.inc
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/0001-gfx-direct-Aboid-usng-VLAs-and-printf-formats.patch b/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/0001-gfx-direct-Aboid-usng-VLAs-and-printf-formats.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/0001-gfx-direct-Aboid-usng-VLAs-and-printf-formats.patch
rename to meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/0001-gfx-direct-Aboid-usng-VLAs-and-printf-formats.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/bashism.patch b/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/bashism.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/bashism.patch
rename to meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/bashism.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/compar_fn_t.patch b/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/compar_fn_t.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/compar_fn_t.patch
rename to meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/compar_fn_t.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/configurefix.patch b/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/configurefix.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/configurefix.patch
rename to meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/configurefix.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/fix-client-gfx_state-initialisation.patch b/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/fix-client-gfx_state-initialisation.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/fix-client-gfx_state-initialisation.patch
rename to meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/fix-client-gfx_state-initialisation.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/fusion.patch b/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/fusion.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/fusion.patch
rename to meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/fusion.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/union-sigval.patch b/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/union-sigval.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/union-sigval.patch
rename to meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/union-sigval.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/use-PTHREAD_MUTEX_RECURSIVE.patch b/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/use-PTHREAD_MUTEX_RECURSIVE.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/use-PTHREAD_MUTEX_RECURSIVE.patch
rename to meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/use-PTHREAD_MUTEX_RECURSIVE.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb_1.7.7.bb b/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb_1.7.7.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb_1.7.7.bb
rename to meta-openembedded/meta-oe/recipes-graphics/directfb/directfb_1.7.7.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch b/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch
rename to meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Run-python-scripts-using-env.patch b/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Run-python-scripts-using-env.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Run-python-scripts-using-env.patch
rename to meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Run-python-scripts-using-env.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-To-fix-error-when-do_package.patch b/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-To-fix-error-when-do_package.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-To-fix-error-when-do_package.patch
rename to meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-To-fix-error-when-do_package.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-disable-build-manpages.patch b/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-disable-build-manpages.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-disable-build-manpages.patch
rename to meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-disable-build-manpages.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb b/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb
rename to meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/fbgrab/fbgrab_1.3.bb b/meta-openembedded/meta-oe/recipes-graphics/fbgrab/fbgrab_1.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/fbgrab/fbgrab_1.3.bb
rename to meta-openembedded/meta-oe/recipes-graphics/fbgrab/fbgrab_1.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/fbida/fbida_2.10.bb b/meta-openembedded/meta-oe/recipes-graphics/fbida/fbida_2.10.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/fbida/fbida_2.10.bb
rename to meta-openembedded/meta-oe/recipes-graphics/fbida/fbida_2.10.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/fbida/files/0001-Avoid-using-host-path.patch b/meta-openembedded/meta-oe/recipes-graphics/fbida/files/0001-Avoid-using-host-path.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/fbida/files/0001-Avoid-using-host-path.patch
rename to meta-openembedded/meta-oe/recipes-graphics/fbida/files/0001-Avoid-using-host-path.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/fbida/files/fix-preprocessor.patch b/meta-openembedded/meta-oe/recipes-graphics/fbida/files/fix-preprocessor.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/fbida/files/fix-preprocessor.patch
rename to meta-openembedded/meta-oe/recipes-graphics/fbida/files/fix-preprocessor.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/fbida/files/support-jpeg-turbo.patch b/meta-openembedded/meta-oe/recipes-graphics/fbida/files/support-jpeg-turbo.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/fbida/files/support-jpeg-turbo.patch
rename to meta-openembedded/meta-oe/recipes-graphics/fbida/files/support-jpeg-turbo.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/fbida/files/use-jpeg-turbo.patch b/meta-openembedded/meta-oe/recipes-graphics/fbida/files/use-jpeg-turbo.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/fbida/files/use-jpeg-turbo.patch
rename to meta-openembedded/meta-oe/recipes-graphics/fbida/files/use-jpeg-turbo.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20170731.bb b/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20170731.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20170731.bb
rename to meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20170731.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/freeglut/freeglut_3.0.0.bb b/meta-openembedded/meta-oe/recipes-graphics/freeglut/freeglut_3.0.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/freeglut/freeglut_3.0.0.bb
rename to meta-openembedded/meta-oe/recipes-graphics/freeglut/freeglut_3.0.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch b/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch
rename to meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm/0002-Avoid-absolute-symlinks.patch b/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm/0002-Avoid-absolute-symlinks.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm/0002-Avoid-absolute-symlinks.patch
rename to meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm/0002-Avoid-absolute-symlinks.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.6.7.bb b/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.6.7.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.6.7.bb
rename to meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.6.7.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gegl/gegl/pkgconfig.patch b/meta-openembedded/meta-oe/recipes-graphics/gegl/gegl/pkgconfig.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/gegl/gegl/pkgconfig.patch
rename to meta-openembedded/meta-oe/recipes-graphics/gegl/gegl/pkgconfig.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb b/meta-openembedded/meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb
rename to meta-openembedded/meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp/0001-configure-ac-do-not-check-for-freetype-config.patch b/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp/0001-configure-ac-do-not-check-for-freetype-config.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp/0001-configure-ac-do-not-check-for-freetype-config.patch
rename to meta-openembedded/meta-oe/recipes-graphics/gimp/gimp/0001-configure-ac-do-not-check-for-freetype-config.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp/0003-Fix-use-of-gegl-API.patch b/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp/0003-Fix-use-of-gegl-API.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp/0003-Fix-use-of-gegl-API.patch
rename to meta-openembedded/meta-oe/recipes-graphics/gimp/gimp/0003-Fix-use-of-gegl-API.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch b/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch
rename to meta-openembedded/meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb b/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb
rename to meta-openembedded/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/glm/files/0001-Make-GLM_ENABLE_EXPERIMENTAL-a-configurable-option.patch b/meta-openembedded/meta-oe/recipes-graphics/glm/files/0001-Make-GLM_ENABLE_EXPERIMENTAL-a-configurable-option.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/glm/files/0001-Make-GLM_ENABLE_EXPERIMENTAL-a-configurable-option.patch
rename to meta-openembedded/meta-oe/recipes-graphics/glm/files/0001-Make-GLM_ENABLE_EXPERIMENTAL-a-configurable-option.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/glm/files/0002-glm-install-headers-only.patch b/meta-openembedded/meta-oe/recipes-graphics/glm/files/0002-glm-install-headers-only.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/glm/files/0002-glm-install-headers-only.patch
rename to meta-openembedded/meta-oe/recipes-graphics/glm/files/0002-glm-install-headers-only.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb b/meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb
rename to meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch b/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch
rename to meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2/0002-Look-for-popt-with-GP_CHECK_LIBRARY-function.patch b/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2/0002-Look-for-popt-with-GP_CHECK_LIBRARY-function.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2/0002-Look-for-popt-with-GP_CHECK_LIBRARY-function.patch
rename to meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2/0002-Look-for-popt-with-GP_CHECK_LIBRARY-function.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.14.bb b/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.14.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.14.bb
rename to meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.14.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch b/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch
rename to meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/10-camera-libgphoto2-device.fdi b/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/10-camera-libgphoto2-device.fdi
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/10-camera-libgphoto2-device.fdi
rename to meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/10-camera-libgphoto2-device.fdi
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/10-camera-libgphoto2.fdi b/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/10-camera-libgphoto2.fdi
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/10-camera-libgphoto2.fdi
rename to meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/10-camera-libgphoto2.fdi
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/40-libgphoto2.rules b/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/40-libgphoto2.rules
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/40-libgphoto2.rules
rename to meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2/40-libgphoto2.rules
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.16.bb b/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.16.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.16.bb
rename to meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.16.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf/0001-Include-stdlib.h-for-exit-API.patch b/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf/0001-Include-stdlib.h-for-exit-API.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf/0001-Include-stdlib.h-for-exit-API.patch
rename to meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf/0001-Include-stdlib.h-for-exit-API.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf/0002-timing.c-Fix-format-security-errors.patch b/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf/0002-timing.c-Fix-format-security-errors.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf/0002-timing.c-Fix-format-security-errors.patch
rename to meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf/0002-timing.c-Fix-format-security-errors.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf/Makevars b/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf/Makevars
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf/Makevars
rename to meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf/Makevars
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb b/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb
rename to meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_1.900.1.bb b/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_1.900.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_1.900.1.bb
rename to meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_1.900.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/leptonica/leptonica_1.74.4.bb b/meta-openembedded/meta-oe/recipes-graphics/leptonica/leptonica_1.74.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/leptonica/leptonica_1.74.4.bb
rename to meta-openembedded/meta-oe/recipes-graphics/leptonica/leptonica_1.74.4.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/libmng/libmng_2.0.3.bb b/meta-openembedded/meta-oe/recipes-graphics/libmng/libmng_2.0.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/libmng/libmng_2.0.3.bb
rename to meta-openembedded/meta-oe/recipes-graphics/libmng/libmng_2.0.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.11.bb b/meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.11.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.11.bb
rename to meta-openembedded/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.11.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Fix-the-error-of-can-t-find-header-file.patch b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Fix-the-error-of-can-t-find-header-file.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Fix-the-error-of-can-t-find-header-file.patch
rename to meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-Fix-the-error-of-can-t-find-header-file.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-use-_nl_msg_cat_cntr-only-with-glibc.patch b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-use-_nl_msg_cat_cntr-only-with-glibc.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-use-_nl_msg_cat_cntr-only-with-glibc.patch
rename to meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-use-_nl_msg_cat_cntr-only-with-glibc.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb
rename to meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui/0001-Fix-GCC-8-warning.patch b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui/0001-Fix-GCC-8-warning.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui/0001-Fix-GCC-8-warning.patch
rename to meta-openembedded/meta-oe/recipes-graphics/libyui/libyui/0001-Fix-GCC-8-warning.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui/0001-Fix-build-with-clang.patch b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui/0001-Fix-build-with-clang.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui/0001-Fix-build-with-clang.patch
rename to meta-openembedded/meta-oe/recipes-graphics/libyui/libyui/0001-Fix-build-with-clang.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_git.bb b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_git.bb
rename to meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0001-check-for-libexecinfo-providing-backtrace-APIs.patch b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0001-check-for-libexecinfo-providing-backtrace-APIs.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0001-check-for-libexecinfo-providing-backtrace-APIs.patch
rename to meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0001-check-for-libexecinfo-providing-backtrace-APIs.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0001-lxdm.conf.in-blacklist-root-for-release-images.patch b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0001-lxdm.conf.in-blacklist-root-for-release-images.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0001-lxdm.conf.in-blacklist-root-for-release-images.patch
rename to meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0001-lxdm.conf.in-blacklist-root-for-release-images.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0002-let-autotools-create-lxdm.conf.patch b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0002-let-autotools-create-lxdm.conf.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0002-let-autotools-create-lxdm.conf.patch
rename to meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/0002-let-autotools-create-lxdm.conf.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/lxdm-pam b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/lxdm-pam
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/lxdm-pam
rename to meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/lxdm-pam
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/lxdm-pam-debug b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/lxdm-pam-debug
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/lxdm-pam-debug
rename to meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/lxdm-pam-debug
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/lxdm.conf b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/lxdm.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/lxdm.conf
rename to meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm/lxdm.conf
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb
rename to meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/numlockx/numlockx_1.2.bb b/meta-openembedded/meta-oe/recipes-graphics/numlockx/numlockx_1.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/numlockx/numlockx_1.2.bb
rename to meta-openembedded/meta-oe/recipes-graphics/numlockx/numlockx_1.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/openbox/files/0001-Makefile.am-avoid-race-when-creating-autostart-direc.patch b/meta-openembedded/meta-oe/recipes-graphics/openbox/files/0001-Makefile.am-avoid-race-when-creating-autostart-direc.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/openbox/files/0001-Makefile.am-avoid-race-when-creating-autostart-direc.patch
rename to meta-openembedded/meta-oe/recipes-graphics/openbox/files/0001-Makefile.am-avoid-race-when-creating-autostart-direc.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb b/meta-openembedded/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb
rename to meta-openembedded/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/openjpeg/files/0001-bmp_read_info_header-reject-bmp-files-with-biBitCoun.patch b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/files/0001-bmp_read_info_header-reject-bmp-files-with-biBitCoun.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/openjpeg/files/0001-bmp_read_info_header-reject-bmp-files-with-biBitCoun.patch
rename to meta-openembedded/meta-oe/recipes-graphics/openjpeg/files/0001-bmp_read_info_header-reject-bmp-files-with-biBitCoun.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.2.0.bb b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.2.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.2.0.bb
rename to meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.2.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb b/meta-openembedded/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb
rename to meta-openembedded/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/pango/pangomm_2.40.1.bb b/meta-openembedded/meta-oe/recipes-graphics/pango/pangomm_2.40.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/pango/pangomm_2.40.1.bb
rename to meta-openembedded/meta-oe/recipes-graphics/pango/pangomm_2.40.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/qrencode/qrencode_git.bb b/meta-openembedded/meta-oe/recipes-graphics/qrencode/qrencode_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/qrencode/qrencode_git.bb
rename to meta-openembedded/meta-oe/recipes-graphics/qrencode/qrencode_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/takao-fonts/takao-fonts_003.03.01.bb b/meta-openembedded/meta-oe/recipes-graphics/takao-fonts/takao-fonts_003.03.01.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/takao-fonts/takao-fonts_003.03.01.bb
rename to meta-openembedded/meta-oe/recipes-graphics/takao-fonts/takao-fonts_003.03.01.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/terminus-font/terminus-font_4.38.bb b/meta-openembedded/meta-oe/recipes-graphics/terminus-font/terminus-font_4.38.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/terminus-font/terminus-font_4.38.bb
rename to meta-openembedded/meta-oe/recipes-graphics/terminus-font/terminus-font_4.38.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract-lang_git.bb b/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract-lang_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract-lang_git.bb
rename to meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract-lang_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract_git.bb b/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract_git.bb
rename to meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0001-tigervnc-remove-includedir.patch b/meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0001-tigervnc-remove-includedir.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0001-tigervnc-remove-includedir.patch
rename to meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0001-tigervnc-remove-includedir.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0002-do-not-build-tests-sub-directory.patch b/meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0002-do-not-build-tests-sub-directory.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0002-do-not-build-tests-sub-directory.patch
rename to meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0002-do-not-build-tests-sub-directory.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0003-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch b/meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0003-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0003-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch
rename to meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0003-add-missing-dynamic-library-to-FLTK_LIBRARIES.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch b/meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch
rename to meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0004-tigervnc-add-fPIC-option-to-COMPILE_FLAGS.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0005-Remove-INITARGS-from-xserver119.patch.patch b/meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0005-Remove-INITARGS-from-xserver119.patch.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0005-Remove-INITARGS-from-xserver119.patch.patch
rename to meta-openembedded/meta-oe/recipes-graphics/tigervnc/files/0005-Remove-INITARGS-from-xserver119.patch.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.8.0.bb b/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.8.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.8.0.bb
rename to meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.8.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib/ts.conf b/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib/ts.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib/ts.conf
rename to meta-openembedded/meta-oe/recipes-graphics/tslib/tslib/ts.conf
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib/tslib.sh b/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib/tslib.sh
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib/tslib.sh
rename to meta-openembedded/meta-oe/recipes-graphics/tslib/tslib/tslib.sh
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.15.bb b/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.15.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.15.bb
rename to meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_1.15.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts/44-source-han-sans-cn.conf b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts/44-source-han-sans-cn.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts/44-source-han-sans-cn.conf
rename to meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts/44-source-han-sans-cn.conf
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts_1.004.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts_1.004.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts_1.004.bb
rename to meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts_1.004.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts/44-source-han-sans-jp.conf b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts/44-source-han-sans-jp.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts/44-source-han-sans-jp.conf
rename to meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts/44-source-han-sans-jp.conf
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts_1.004.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts_1.004.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts_1.004.bb
rename to meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts_1.004.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts/44-source-han-sans-kr.conf b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts/44-source-han-sans-kr.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts/44-source-han-sans-kr.conf
rename to meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts/44-source-han-sans-kr.conf
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts_1.004.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts_1.004.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts_1.004.bb
rename to meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts_1.004.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts/44-source-han-sans-tw.conf b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts/44-source-han-sans-tw.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts/44-source-han-sans-tw.conf
rename to meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts/44-source-han-sans-tw.conf
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts_1.004.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts_1.004.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts_1.004.bb
rename to meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts_1.004.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-abyssinica_1.500.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-abyssinica_1.500.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-abyssinica_1.500.bb
rename to meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-abyssinica_1.500.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-arphic-uming_20080216.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-arphic-uming_20080216.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-arphic-uming_20080216.bb
rename to meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-arphic-uming_20080216.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu/30-dejavu-aliases.conf b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu/30-dejavu-aliases.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu/30-dejavu-aliases.conf
rename to meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu/30-dejavu-aliases.conf
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb
rename to meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb
rename to meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb
rename to meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.0.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.0.bb
rename to meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata/OFL.txt b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata/OFL.txt
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata/OFL.txt
rename to meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata/OFL.txt
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb
rename to meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation-sans-narrow/30-0-liberation-sans-narrow.conf b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation-sans-narrow/30-0-liberation-sans-narrow.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation-sans-narrow/30-0-liberation-sans-narrow.conf
rename to meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation-sans-narrow/30-0-liberation-sans-narrow.conf
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation-sans-narrow_1.07.4.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation-sans-narrow_1.07.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation-sans-narrow_1.07.4.bb
rename to meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation-sans-narrow_1.07.4.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation_0.2.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation_0.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation_0.2.bb
rename to meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation_0.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-lklug_0.6-14.20090803cvs.fc24.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-lklug_0.6-14.20090803cvs.fc24.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-lklug_0.6-14.20090803cvs.fc24.bb
rename to meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-lklug_0.6-14.20090803cvs.fc24.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-lohit_2.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-lohit_2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-lohit_2.bb
rename to meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-lohit_2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb
rename to meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb
rename to meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-sazanami_20040629.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-sazanami_20040629.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-sazanami_20040629.bb
rename to meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-sazanami_20040629.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-tlwg_0.6.1.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-tlwg_0.6.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-tlwg_0.6.1.bb
rename to meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-tlwg_0.6.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.80.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.80.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.80.bb
rename to meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.80.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-vlgothic_20141206.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-vlgothic_20141206.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-vlgothic_20141206.bb
rename to meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-vlgothic_20141206.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.9.45.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.9.45.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.9.45.bb
rename to meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.9.45.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf.inc b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf.inc
rename to meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf.inc
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_git.bb b/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_git.bb
rename to meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/endian-fix.patch b/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/endian-fix.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/endian-fix.patch
rename to meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/endian-fix.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/remove-redundant-RPATH.patch b/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/remove-redundant-RPATH.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/remove-redundant-RPATH.patch
rename to meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/remove-redundant-RPATH.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/starting-fix.patch b/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/starting-fix.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/starting-fix.patch
rename to meta-openembedded/meta-oe/recipes-graphics/x11vnc/files/starting-fix.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb b/meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
rename to meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xcursorgen/xcursorgen_1.0.5.bb b/meta-openembedded/meta-oe/recipes-graphics/xcursorgen/xcursorgen_1.0.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xcursorgen/xcursorgen_1.0.5.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xcursorgen/xcursorgen_1.0.5.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xdotool/xdotool_1.20100416.2809.bb b/meta-openembedded/meta-oe/recipes-graphics/xdotool/xdotool_1.20100416.2809.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xdotool/xdotool_1.20100416.2809.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xdotool/xdotool_1.20100416.2809.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/bdftopcf_1.1.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/bdftopcf_1.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/bdftopcf_1.1.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-app/bdftopcf_1.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/iceauth_1.0.7.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/iceauth_1.0.7.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/iceauth_1.0.7.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-app/iceauth_1.0.7.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/sessreg/0001-Makefile.am-Error-Fix.patch b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/sessreg/0001-Makefile.am-Error-Fix.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/sessreg/0001-Makefile.am-Error-Fix.patch
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-app/sessreg/0001-Makefile.am-Error-Fix.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.1.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.1.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/setxkbmap_1.3.1.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/setxkbmap_1.3.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/setxkbmap_1.3.1.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-app/setxkbmap_1.3.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/twm_1.0.9.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/twm_1.0.9.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/twm_1.0.9.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-app/twm_1.0.9.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xclock_1.0.5.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xclock_1.0.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xclock_1.0.5.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-app/xclock_1.0.5.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xfontsel_1.0.5.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xfontsel_1.0.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xfontsel_1.0.5.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-app/xfontsel_1.0.5.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xgamma_1.0.6.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xgamma_1.0.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xgamma_1.0.6.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-app/xgamma_1.0.6.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbevd_1.1.4.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbevd_1.1.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbevd_1.1.4.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbevd_1.1.4.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.4.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.4.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.4.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbutils_1.0.4.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbutils_1.0.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbutils_1.0.4.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-app/xkbutils_1.0.4.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xlsatoms_1.1.2.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xlsatoms_1.1.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xlsatoms_1.1.2.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-app/xlsatoms_1.1.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xlsclients_1.1.4.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xlsclients_1.1.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xlsclients_1.1.4.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-app/xlsclients_1.1.4.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.6.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.6.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.6.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xmag_1.0.5.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xmag_1.0.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xmag_1.0.5.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-app/xmag_1.0.5.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xmessage_1.0.4.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xmessage_1.0.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xmessage_1.0.4.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-app/xmessage_1.0.4.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xrdb_1.1.0.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xrdb_1.1.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xrdb_1.1.0.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-app/xrdb_1.1.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xrefresh_1.0.5.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xrefresh_1.0.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xrefresh_1.0.5.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-app/xrefresh_1.0.5.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xsetmode_1.0.0.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xsetmode_1.0.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xsetmode_1.0.0.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-app/xsetmode_1.0.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xsetroot_1.1.1.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xsetroot_1.1.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xsetroot_1.1.1.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-app/xsetroot_1.1.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xstdcmap_1.0.3.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xstdcmap_1.0.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xstdcmap_1.0.3.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-app/xstdcmap_1.0.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_330.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_330.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_330.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_330.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xwd_1.0.6.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xwd_1.0.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xwd_1.0.6.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-app/xwd_1.0.6.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xwud_1.0.5.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xwud_1.0.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xwud_1.0.5.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-app/xwud_1.0.5.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-data/xbitmaps_1.1.1.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-data/xbitmaps_1.1.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-data/xbitmaps_1.1.1.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-data/xbitmaps_1.1.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-data/xorg-data-common.inc b/meta-openembedded/meta-oe/recipes-graphics/xorg-data/xorg-data-common.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-data/xorg-data-common.inc
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-data/xorg-data-common.inc
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-doc/xorg-doc-common.inc b/meta-openembedded/meta-oe/recipes-graphics/xorg-doc/xorg-doc-common.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-doc/xorg-doc-common.inc
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-doc/xorg-doc-common.inc
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.7.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.7.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.7.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.7.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/10-x11-input-tslib.fdi b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/10-x11-input-tslib.fdi
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/10-x11-input-tslib.fdi
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/10-x11-input-tslib.fdi
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/99-xf86-input-tslib.rules b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/99-xf86-input-tslib.rules
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/99-xf86-input-tslib.rules
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/99-xf86-input-tslib.rules
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/double-free-crash.patch b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/double-free-crash.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/double-free-crash.patch
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/double-free-crash.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xf86-input-tslib-0.0.6-xf86XInputSetScreen.patch b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xf86-input-tslib-0.0.6-xf86XInputSetScreen.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xf86-input-tslib-0.0.6-xf86XInputSetScreen.patch
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xf86-input-tslib-0.0.6-xf86XInputSetScreen.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xf86-input-tslib-port-ABI-12-r48.patch b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xf86-input-tslib-port-ABI-12-r48.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xf86-input-tslib-port-ABI-12-r48.patch
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xf86-input-tslib-port-ABI-12-r48.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xserver-174-XGetPointerControl.patch b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xserver-174-XGetPointerControl.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xserver-174-XGetPointerControl.patch
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib/xserver-174-XGetPointerControl.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.6.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.6.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.6.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-void_1.4.1.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-void_1.4.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-void_1.4.1.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-void_1.4.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_7.8.0.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_7.8.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_7.8.0.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_7.8.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.15.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.15.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.15.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.15.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-adobe-100dpi_1.0.3.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-adobe-100dpi_1.0.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-adobe-100dpi_1.0.3.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-adobe-100dpi_1.0.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-adobe-utopia-100dpi_1.0.4.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-adobe-utopia-100dpi_1.0.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-adobe-utopia-100dpi_1.0.4.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-adobe-utopia-100dpi_1.0.4.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bh-100dpi_1.0.3.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bh-100dpi_1.0.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bh-100dpi_1.0.3.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bh-100dpi_1.0.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.3.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.3.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bitstream-100dpi_1.0.3.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bitstream-100dpi_1.0.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bitstream-100dpi_1.0.3.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bitstream-100dpi_1.0.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-cursor-misc_1.0.3.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-cursor-misc_1.0.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-cursor-misc_1.0.3.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-cursor-misc_1.0.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-misc-misc_1.1.2.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-misc-misc_1.1.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-misc-misc_1.1.2.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-misc-misc_1.1.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-font/xorg-fonts-100dpi.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-font/xorg-fonts-100dpi.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-font/xorg-fonts-100dpi.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-font/xorg-fonts-100dpi.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/liblbxutil-1.1.0/mkg3states-1.1.patch b/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/liblbxutil-1.1.0/mkg3states-1.1.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/liblbxutil-1.1.0/mkg3states-1.1.patch
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-lib/liblbxutil-1.1.0/mkg3states-1.1.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.13.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.13.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.13.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.13.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/libxkbui_1.0.2.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/libxkbui_1.0.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/libxkbui_1.0.2.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xorg-lib/libxkbui_1.0.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-COPYING-add-GPLv2-license-file.patch b/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-COPYING-add-GPLv2-license-file.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-COPYING-add-GPLv2-license-file.patch
rename to meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-COPYING-add-GPLv2-license-file.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-Don-t-install-Xsession-or-Xserver.patch b/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-Don-t-install-Xsession-or-Xserver.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-Don-t-install-Xsession-or-Xserver.patch
rename to meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-Don-t-install-Xsession-or-Xserver.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0002-add-setdpi-Xinit.d-script.patch b/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0002-add-setdpi-Xinit.d-script.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0002-add-setdpi-Xinit.d-script.patch
rename to meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0002-add-setdpi-Xinit.d-script.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0006-add-support-for-etc-X11-xserver-system.patch b/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0006-add-support-for-etc-X11-xserver-system.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0006-add-support-for-etc-X11-xserver-system.patch
rename to meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0006-add-support-for-etc-X11-xserver-system.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0007-use-own-functions-file-instead-etc-init.d-functions.patch b/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0007-use-own-functions-file-instead-etc-init.d-functions.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0007-use-own-functions-file-instead-etc-init.d-functions.patch
rename to meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0007-use-own-functions-file-instead-etc-init.d-functions.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0008-xserver-common-add-dpi-and-nocursor-params-for-gta01.patch b/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0008-xserver-common-add-dpi-and-nocursor-params-for-gta01.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0008-xserver-common-add-dpi-and-nocursor-params-for-gta01.patch
rename to meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0008-xserver-common-add-dpi-and-nocursor-params-for-gta01.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0009-xserver-common-add-support-for-n900-alias-nokia_rx-5.patch b/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0009-xserver-common-add-support-for-n900-alias-nokia_rx-5.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0009-xserver-common-add-support-for-n900-alias-nokia_rx-5.patch
rename to meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0009-xserver-common-add-support-for-n900-alias-nokia_rx-5.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0010-xserver-common-add-support-for-nexus-S-alias-herring.patch b/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0010-xserver-common-add-support-for-nexus-S-alias-herring.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0010-xserver-common-add-support-for-nexus-S-alias-herring.patch
rename to meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0010-xserver-common-add-support-for-nexus-S-alias-herring.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0011-xserver-common-add-support-for-nexus-one-alias-mahim.patch b/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0011-xserver-common-add-support-for-nexus-one-alias-mahim.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0011-xserver-common-add-support-for-nexus-one-alias-mahim.patch
rename to meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0011-xserver-common-add-support-for-nexus-one-alias-mahim.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0012-xserver-common-add-support-for-gta04-alias-OpenPhoen.patch b/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0012-xserver-common-add-support-for-gta04-alias-OpenPhoen.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0012-xserver-common-add-support-for-gta04-alias-OpenPhoen.patch
rename to meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0012-xserver-common-add-support-for-gta04-alias-OpenPhoen.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0013-xserver-common-add-support-for-tuna-alias-Galaxy-Nex.patch b/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0013-xserver-common-add-support-for-tuna-alias-Galaxy-Nex.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0013-xserver-common-add-support-for-tuna-alias-Galaxy-Nex.patch
rename to meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0013-xserver-common-add-support-for-tuna-alias-Galaxy-Nex.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0015-xserver-common-disable-TCP-connections.patch b/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0015-xserver-common-disable-TCP-connections.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0015-xserver-common-disable-TCP-connections.patch
rename to meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0015-xserver-common-disable-TCP-connections.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb b/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xtscal/xtscal/30xTs_Calibrate.sh b/meta-openembedded/meta-oe/recipes-graphics/xtscal/xtscal/30xTs_Calibrate.sh
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xtscal/xtscal/30xTs_Calibrate.sh
rename to meta-openembedded/meta-oe/recipes-graphics/xtscal/xtscal/30xTs_Calibrate.sh
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xtscal/xtscal/change-cross.patch b/meta-openembedded/meta-oe/recipes-graphics/xtscal/xtscal/change-cross.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xtscal/xtscal/change-cross.patch
rename to meta-openembedded/meta-oe/recipes-graphics/xtscal/xtscal/change-cross.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xtscal/xtscal/cleanup.patch b/meta-openembedded/meta-oe/recipes-graphics/xtscal/xtscal/cleanup.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xtscal/xtscal/cleanup.patch
rename to meta-openembedded/meta-oe/recipes-graphics/xtscal/xtscal/cleanup.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xtscal/xtscal/dso_linking_change_build_fix.patch b/meta-openembedded/meta-oe/recipes-graphics/xtscal/xtscal/dso_linking_change_build_fix.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xtscal/xtscal/dso_linking_change_build_fix.patch
rename to meta-openembedded/meta-oe/recipes-graphics/xtscal/xtscal/dso_linking_change_build_fix.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-graphics/xtscal/xtscal_0.6.3.bb b/meta-openembedded/meta-oe/recipes-graphics/xtscal/xtscal_0.6.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-graphics/xtscal/xtscal_0.6.3.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xtscal/xtscal_0.6.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/agent-proxy/agent-proxy_git.bb b/meta-openembedded/meta-oe/recipes-kernel/agent-proxy/agent-proxy_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/agent-proxy/agent-proxy_git.bb
rename to meta-openembedded/meta-oe/recipes-kernel/agent-proxy/agent-proxy_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/agent-proxy/files/0001-Makefile-Add-LDFLAGS-variable.patch b/meta-openembedded/meta-oe/recipes-kernel/agent-proxy/files/0001-Makefile-Add-LDFLAGS-variable.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/agent-proxy/files/0001-Makefile-Add-LDFLAGS-variable.patch
rename to meta-openembedded/meta-oe/recipes-kernel/agent-proxy/files/0001-Makefile-Add-LDFLAGS-variable.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/cpupower/cpupower.bb b/meta-openembedded/meta-oe/recipes-kernel/cpupower/cpupower.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/cpupower/cpupower.bb
rename to meta-openembedded/meta-oe/recipes-kernel/cpupower/cpupower.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/crash/crash/0001-cross_add_configure_option.patch b/meta-openembedded/meta-oe/recipes-kernel/crash/crash/0001-cross_add_configure_option.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/crash/crash/0001-cross_add_configure_option.patch
rename to meta-openembedded/meta-oe/recipes-kernel/crash/crash/0001-cross_add_configure_option.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/crash/crash/0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch b/meta-openembedded/meta-oe/recipes-kernel/crash/crash/0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/crash/crash/0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch
rename to meta-openembedded/meta-oe/recipes-kernel/crash/crash/0002-crash-fix-build-error-unknown-type-name-gdb_fpregset.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/crash/crash/0003-crash-detect-the-sysroot-s-glibc-header-file.patch b/meta-openembedded/meta-oe/recipes-kernel/crash/crash/0003-crash-detect-the-sysroot-s-glibc-header-file.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/crash/crash/0003-crash-detect-the-sysroot-s-glibc-header-file.patch
rename to meta-openembedded/meta-oe/recipes-kernel/crash/crash/0003-crash-detect-the-sysroot-s-glibc-header-file.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/crash/crash/7001force_define_architecture.patch b/meta-openembedded/meta-oe/recipes-kernel/crash/crash/7001force_define_architecture.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/crash/crash/7001force_define_architecture.patch
rename to meta-openembedded/meta-oe/recipes-kernel/crash/crash/7001force_define_architecture.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/crash/crash/7003cross_ranlib.patch b/meta-openembedded/meta-oe/recipes-kernel/crash/crash/7003cross_ranlib.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/crash/crash/7003cross_ranlib.patch
rename to meta-openembedded/meta-oe/recipes-kernel/crash/crash/7003cross_ranlib.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/crash/crash/config-site.crash-7.0.9 b/meta-openembedded/meta-oe/recipes-kernel/crash/crash/config-site.crash-7.0.9
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/crash/crash/config-site.crash-7.0.9
rename to meta-openembedded/meta-oe/recipes-kernel/crash/crash/config-site.crash-7.0.9
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/crash/crash/donnot-extract-gdb-during-do-compile.patch b/meta-openembedded/meta-oe/recipes-kernel/crash/crash/donnot-extract-gdb-during-do-compile.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/crash/crash/donnot-extract-gdb-during-do-compile.patch
rename to meta-openembedded/meta-oe/recipes-kernel/crash/crash/donnot-extract-gdb-during-do-compile.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/crash/crash/gdb_build_jobs_and_not_write_crash_target.patch b/meta-openembedded/meta-oe/recipes-kernel/crash/crash/gdb_build_jobs_and_not_write_crash_target.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/crash/crash/gdb_build_jobs_and_not_write_crash_target.patch
rename to meta-openembedded/meta-oe/recipes-kernel/crash/crash/gdb_build_jobs_and_not_write_crash_target.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/crash/crash/remove-unrecognized-gcc-option-m32-for-mips.patch b/meta-openembedded/meta-oe/recipes-kernel/crash/crash/remove-unrecognized-gcc-option-m32-for-mips.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/crash/crash/remove-unrecognized-gcc-option-m32-for-mips.patch
rename to meta-openembedded/meta-oe/recipes-kernel/crash/crash/remove-unrecognized-gcc-option-m32-for-mips.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/crash/crash/sim-common-sim-arange-fix-extern-inline-handling.patch b/meta-openembedded/meta-oe/recipes-kernel/crash/crash/sim-common-sim-arange-fix-extern-inline-handling.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/crash/crash/sim-common-sim-arange-fix-extern-inline-handling.patch
rename to meta-openembedded/meta-oe/recipes-kernel/crash/crash/sim-common-sim-arange-fix-extern-inline-handling.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/crash/crash/sim-ppc-drop-LIBS-from-psim-dependency.patch b/meta-openembedded/meta-oe/recipes-kernel/crash/crash/sim-ppc-drop-LIBS-from-psim-dependency.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/crash/crash/sim-ppc-drop-LIBS-from-psim-dependency.patch
rename to meta-openembedded/meta-oe/recipes-kernel/crash/crash/sim-ppc-drop-LIBS-from-psim-dependency.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.2.0.bb b/meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.2.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.2.0.bb
rename to meta-openembedded/meta-oe/recipes-kernel/crash/crash_7.2.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb b/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb
rename to meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.18.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/ipmiutil/ipmiutil/fix_systemd_path.patch b/meta-openembedded/meta-oe/recipes-kernel/ipmiutil/ipmiutil/fix_systemd_path.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/ipmiutil/ipmiutil/fix_systemd_path.patch
rename to meta-openembedded/meta-oe/recipes-kernel/ipmiutil/ipmiutil/fix_systemd_path.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/ipmiutil/ipmiutil_3.0.5.bb b/meta-openembedded/meta-oe/recipes-kernel/ipmiutil/ipmiutil_3.0.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/ipmiutil/ipmiutil_3.0.5.bb
rename to meta-openembedded/meta-oe/recipes-kernel/ipmiutil/ipmiutil_3.0.5.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch.inc b/meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch.inc
rename to meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch.inc
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch/0001-kpatch-build-add-cross-compilation-support.patch b/meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch/0001-kpatch-build-add-cross-compilation-support.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch/0001-kpatch-build-add-cross-compilation-support.patch
rename to meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch/0001-kpatch-build-add-cross-compilation-support.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch/0002-kpatch-build-allow-overriding-of-distro-name.patch b/meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch/0002-kpatch-build-allow-overriding-of-distro-name.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch/0002-kpatch-build-allow-overriding-of-distro-name.patch
rename to meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch/0002-kpatch-build-allow-overriding-of-distro-name.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch_git.bb b/meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch_git.bb
rename to meta-openembedded/meta-oe/recipes-kernel/kpatch/kpatch_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/linux/linux.inc b/meta-openembedded/meta-oe/recipes-kernel/linux/linux.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/linux/linux.inc
rename to meta-openembedded/meta-oe/recipes-kernel/linux/linux.inc
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch
rename to meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch
rename to meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.2.bb b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.2.bb
rename to meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/0001-fix-compile-error-on-arch-x32.patch b/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/0001-fix-compile-error-on-arch-x32.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/0001-fix-compile-error-on-arch-x32.patch
rename to meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/0001-fix-compile-error-on-arch-x32.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/0001-minicoredumper-Initialize-pointer-to-config-struct-t.patch b/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/0001-minicoredumper-Initialize-pointer-to-config-struct-t.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/0001-minicoredumper-Initialize-pointer-to-config-struct-t.patch
rename to meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/0001-minicoredumper-Initialize-pointer-to-config-struct-t.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/minicoredumper.init b/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/minicoredumper.init
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/minicoredumper.init
rename to meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/minicoredumper.init
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/minicoredumper.service b/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/minicoredumper.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/minicoredumper.service
rename to meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/minicoredumper.service
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.0.bb b/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.0.bb
rename to meta-openembedded/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile.inc b/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile.inc
rename to meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile.inc
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile/0001-Add-rmb-definition-for-NIOS2-architecture.patch b/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile/0001-Add-rmb-definition-for-NIOS2-architecture.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile/0001-Add-rmb-definition-for-NIOS2-architecture.patch
rename to meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile/0001-Add-rmb-definition-for-NIOS2-architecture.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile/0001-Fix-FTBFS-problem-with-GCC-6.patch b/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile/0001-Fix-FTBFS-problem-with-GCC-6.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile/0001-Fix-FTBFS-problem-with-GCC-6.patch
rename to meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile/0001-Fix-FTBFS-problem-with-GCC-6.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile/acinclude.m4 b/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile/acinclude.m4
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile/acinclude.m4
rename to meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile/acinclude.m4
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile/automake-foreign.patch b/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile/automake-foreign.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile/automake-foreign.patch
rename to meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile/automake-foreign.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile/musl.patch b/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile/musl.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile/musl.patch
rename to meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile/musl.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile/oprofile-cross-compile-tests.patch b/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile/oprofile-cross-compile-tests.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile/oprofile-cross-compile-tests.patch
rename to meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile/oprofile-cross-compile-tests.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile/root-home-dir.patch b/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile/root-home-dir.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile/root-home-dir.patch
rename to meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile/root-home-dir.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile/run-ptest b/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile/run-ptest
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile/run-ptest
rename to meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile/run-ptest
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile_1.1.0.bb b/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile_1.1.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile_1.1.0.bb
rename to meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile_1.1.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/alsa/alsa-oss/libio.patch b/meta-openembedded/meta-oe/recipes-multimedia/alsa/alsa-oss/libio.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/alsa/alsa-oss/libio.patch
rename to meta-openembedded/meta-oe/recipes-multimedia/alsa/alsa-oss/libio.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.28.bb b/meta-openembedded/meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.28.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.28.bb
rename to meta-openembedded/meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.28.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/audiofile/audiofile_0.3.6.bb b/meta-openembedded/meta-oe/recipes-multimedia/audiofile/audiofile_0.3.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/audiofile/audiofile_0.3.6.bb
rename to meta-openembedded/meta-oe/recipes-multimedia/audiofile/audiofile_0.3.6.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/audiofile/files/0001-fix-negative-shift-constants.patch b/meta-openembedded/meta-oe/recipes-multimedia/audiofile/files/0001-fix-negative-shift-constants.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/audiofile/files/0001-fix-negative-shift-constants.patch
rename to meta-openembedded/meta-oe/recipes-multimedia/audiofile/files/0001-fix-negative-shift-constants.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/audiofile/files/0002-fix-build-on-gcc6.patch b/meta-openembedded/meta-oe/recipes-multimedia/audiofile/files/0002-fix-build-on-gcc6.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/audiofile/files/0002-fix-build-on-gcc6.patch
rename to meta-openembedded/meta-oe/recipes-multimedia/audiofile/files/0002-fix-build-on-gcc6.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/audiofile/files/0003-fix-CVE-2015-7747.patch b/meta-openembedded/meta-oe/recipes-multimedia/audiofile/files/0003-fix-CVE-2015-7747.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/audiofile/files/0003-fix-CVE-2015-7747.patch
rename to meta-openembedded/meta-oe/recipes-multimedia/audiofile/files/0003-fix-CVE-2015-7747.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb b/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb
rename to meta-openembedded/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0001-define-__THROW-to-avoid-build-issue-with-musl.patch b/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0001-define-__THROW-to-avoid-build-issue-with-musl.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0001-define-__THROW-to-avoid-build-issue-with-musl.patch
rename to meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0001-define-__THROW-to-avoid-build-issue-with-musl.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0001-do-not-create-a-run-test-to-determine-order-of-bitfi.patch b/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0001-do-not-create-a-run-test-to-determine-order-of-bitfi.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0001-do-not-create-a-run-test-to-determine-order-of-bitfi.patch
rename to meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0001-do-not-create-a-run-test-to-determine-order-of-bitfi.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0001-genisoimage-Fix-fprintf-format-errors.patch b/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0001-genisoimage-Fix-fprintf-format-errors.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0001-genisoimage-Fix-fprintf-format-errors.patch
rename to meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0001-genisoimage-Fix-fprintf-format-errors.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0002-Do-not-use-rcmd-on-build-with-musl.patch b/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0002-Do-not-use-rcmd-on-build-with-musl.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0002-Do-not-use-rcmd-on-build-with-musl.patch
rename to meta-openembedded/meta-oe/recipes-multimedia/cdrkit/files/0002-Do-not-use-rcmd-on-build-with-musl.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/0001-audio_alsa09.c-alsa-drain-fix.patch b/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/0001-audio_alsa09.c-alsa-drain-fix.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/0001-audio_alsa09.c-alsa-drain-fix.patch
rename to meta-openembedded/meta-oe/recipes-multimedia/esound/esound/0001-audio_alsa09.c-alsa-drain-fix.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/0002-Undefine-open64-and-fopen64.patch b/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/0002-Undefine-open64-and-fopen64.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/0002-Undefine-open64-and-fopen64.patch
rename to meta-openembedded/meta-oe/recipes-multimedia/esound/esound/0002-Undefine-open64-and-fopen64.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/0003-Use-I-path-in-configure.patch b/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/0003-Use-I-path-in-configure.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/0003-Use-I-path-in-configure.patch
rename to meta-openembedded/meta-oe/recipes-multimedia/esound/esound/0003-Use-I-path-in-configure.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/no-docs.patch b/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/no-docs.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/esound/esound/no-docs.patch
rename to meta-openembedded/meta-oe/recipes-multimedia/esound/esound/no-docs.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/esound/esound_0.2.41.bb b/meta-openembedded/meta-oe/recipes-multimedia/esound/esound_0.2.41.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/esound/esound_0.2.41.bb
rename to meta-openembedded/meta-oe/recipes-multimedia/esound/esound_0.2.41.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/faad2/faad2_2.7.bb b/meta-openembedded/meta-oe/recipes-multimedia/faad2/faad2_2.7.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/faad2/faad2_2.7.bb
rename to meta-openembedded/meta-oe/recipes-multimedia/faad2/faad2_2.7.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/id3lib/id3lib/acdefine.patch b/meta-openembedded/meta-oe/recipes-multimedia/id3lib/id3lib/acdefine.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/id3lib/id3lib/acdefine.patch
rename to meta-openembedded/meta-oe/recipes-multimedia/id3lib/id3lib/acdefine.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/id3lib/id3lib_3.8.3.bb b/meta-openembedded/meta-oe/recipes-multimedia/id3lib/id3lib_3.8.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/id3lib/id3lib_3.8.3.bb
rename to meta-openembedded/meta-oe/recipes-multimedia/id3lib/id3lib_3.8.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid/0001-wscript-add-pthread-library-dependency-to-fix-linkin.patch b/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid/0001-wscript-add-pthread-library-dependency-to-fix-linkin.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid/0001-wscript-add-pthread-library-dependency-to-fix-linkin.patch
rename to meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid/0001-wscript-add-pthread-library-dependency-to-fix-linkin.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid/0002-aarch64.patch b/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid/0002-aarch64.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid/0002-aarch64.patch
rename to meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid/0002-aarch64.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb b/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb
rename to meta-openembedded/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_git.bb b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_git.bb
rename to meta-openembedded/meta-oe/recipes-multimedia/jack/jack_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/libass/libass_0.14.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/libass/libass_0.14.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/libass/libass_0.14.0.bb
rename to meta-openembedded/meta-oe/recipes-multimedia/libass/libass_0.14.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/libburn/libburn_1.4.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/libburn/libburn_1.4.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/libburn/libburn_1.4.0.bb
rename to meta-openembedded/meta-oe/recipes-multimedia/libburn/libburn_1.4.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+0.93+1.bb b/meta-openembedded/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+0.93+1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+0.93+1.bb
rename to meta-openembedded/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+0.93+1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/libcdio/libcdio_2.0.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/libcdio/libcdio_2.0.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/libcdio/libcdio_2.0.0.bb
rename to meta-openembedded/meta-oe/recipes-multimedia/libcdio/libcdio_2.0.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/libdvdread/libdvdread_5.0.3.bb b/meta-openembedded/meta-oe/recipes-multimedia/libdvdread/libdvdread_5.0.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/libdvdread/libdvdread_5.0.3.bb
rename to meta-openembedded/meta-oe/recipes-multimedia/libdvdread/libdvdread_5.0.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/libmad/libmad/0004-Remove-clang-unsupported-compiler-flags.patch b/meta-openembedded/meta-oe/recipes-multimedia/libmad/libmad/0004-Remove-clang-unsupported-compiler-flags.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/libmad/libmad/0004-Remove-clang-unsupported-compiler-flags.patch
rename to meta-openembedded/meta-oe/recipes-multimedia/libmad/libmad/0004-Remove-clang-unsupported-compiler-flags.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/libmad/libmad/add-pkgconfig.patch b/meta-openembedded/meta-oe/recipes-multimedia/libmad/libmad/add-pkgconfig.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/libmad/libmad/add-pkgconfig.patch
rename to meta-openembedded/meta-oe/recipes-multimedia/libmad/libmad/add-pkgconfig.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/libmad/libmad/automake-foreign.patch b/meta-openembedded/meta-oe/recipes-multimedia/libmad/libmad/automake-foreign.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/libmad/libmad/automake-foreign.patch
rename to meta-openembedded/meta-oe/recipes-multimedia/libmad/libmad/automake-foreign.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/libmad/libmad/fix_for_mips_with_gcc-4.5.0.patch b/meta-openembedded/meta-oe/recipes-multimedia/libmad/libmad/fix_for_mips_with_gcc-4.5.0.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/libmad/libmad/fix_for_mips_with_gcc-4.5.0.patch
rename to meta-openembedded/meta-oe/recipes-multimedia/libmad/libmad/fix_for_mips_with_gcc-4.5.0.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/libmad/libmad/no-force-mem.patch b/meta-openembedded/meta-oe/recipes-multimedia/libmad/libmad/no-force-mem.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/libmad/libmad/no-force-mem.patch
rename to meta-openembedded/meta-oe/recipes-multimedia/libmad/libmad/no-force-mem.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/libmad/libmad/obsolete_automake_macros.patch b/meta-openembedded/meta-oe/recipes-multimedia/libmad/libmad/obsolete_automake_macros.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/libmad/libmad/obsolete_automake_macros.patch
rename to meta-openembedded/meta-oe/recipes-multimedia/libmad/libmad/obsolete_automake_macros.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb b/meta-openembedded/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb
rename to meta-openembedded/meta-oe/recipes-multimedia/libmad/libmad_0.15.1b.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/libmms/libmms_0.6.4.bb b/meta-openembedded/meta-oe/recipes-multimedia/libmms/libmms_0.6.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/libmms/libmms_0.6.4.bb
rename to meta-openembedded/meta-oe/recipes-multimedia/libmms/libmms_0.6.4.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.8.5.bb b/meta-openembedded/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.8.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.8.5.bb
rename to meta-openembedded/meta-oe/recipes-multimedia/libmodplug/libmodplug_0.8.8.5.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/libopus/libopus_1.1.3.bb b/meta-openembedded/meta-oe/recipes-multimedia/libopus/libopus_1.1.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/libopus/libopus_1.1.3.bb
rename to meta-openembedded/meta-oe/recipes-multimedia/libopus/libopus_1.1.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/libsdl-image/libsdl-image/configure.patch b/meta-openembedded/meta-oe/recipes-multimedia/libsdl-image/libsdl-image/configure.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/libsdl-image/libsdl-image/configure.patch
rename to meta-openembedded/meta-oe/recipes-multimedia/libsdl-image/libsdl-image/configure.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb b/meta-openembedded/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb
rename to meta-openembedded/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/libsdl-image/libsdl2-image_2.0.1.bb b/meta-openembedded/meta-oe/recipes-multimedia/libsdl-image/libsdl2-image_2.0.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/libsdl-image/libsdl2-image_2.0.1.bb
rename to meta-openembedded/meta-oe/recipes-multimedia/libsdl-image/libsdl2-image_2.0.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer/configure.patch b/meta-openembedded/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer/configure.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer/configure.patch
rename to meta-openembedded/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer/configure.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.12.bb b/meta-openembedded/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.12.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.12.bb
rename to meta-openembedded/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.12.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/libsdl-mixer/libsdl2-mixer_2.0.2.bb b/meta-openembedded/meta-oe/recipes-multimedia/libsdl-mixer/libsdl2-mixer_2.0.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/libsdl-mixer/libsdl2-mixer_2.0.2.bb
rename to meta-openembedded/meta-oe/recipes-multimedia/libsdl-mixer/libsdl2-mixer_2.0.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/live555/files/config.linux-cross b/meta-openembedded/meta-oe/recipes-multimedia/live555/files/config.linux-cross
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/live555/files/config.linux-cross
rename to meta-openembedded/meta-oe/recipes-multimedia/live555/files/config.linux-cross
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/live555/live555.inc b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/live555/live555.inc
rename to meta-openembedded/meta-oe/recipes-multimedia/live555/live555.inc
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20170410.bb b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20170410.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20170410.bb
rename to meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20170410.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.6.bb b/meta-openembedded/meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.6.bb
rename to meta-openembedded/meta-oe/recipes-multimedia/mikmod/libmikmod_3.3.6.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d b/meta-openembedded/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
rename to meta-openembedded/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna-daemon.init.d
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service b/meta-openembedded/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
rename to meta-openembedded/meta-oe/recipes-multimedia/minidlna/minidlna/minidlna.service
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mplayer-common.bb b/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mplayer-common.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mplayer-common.bb
rename to meta-openembedded/meta-oe/recipes-multimedia/mplayer/mplayer-common.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mplayer-common/mplayer.conf b/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mplayer-common/mplayer.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mplayer-common/mplayer.conf
rename to meta-openembedded/meta-oe/recipes-multimedia/mplayer/mplayer-common/mplayer.conf
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb
rename to meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/opus-tools/opus-tools_0.1.8.bb b/meta-openembedded/meta-oe/recipes-multimedia/opus-tools/opus-tools_0.1.8.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/opus-tools/opus-tools_0.1.8.bb
rename to meta-openembedded/meta-oe/recipes-multimedia/opus-tools/opus-tools_0.1.8.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol/0001-build-sys-Use-C-11-for-building.patch b/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol/0001-build-sys-Use-C-11-for-building.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol/0001-build-sys-Use-C-11-for-building.patch
rename to meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol/0001-build-sys-Use-C-11-for-building.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol/0002-build-sys-Add-m4-file-for-AX_CXX_COMPILE_STDCXX_11.patch b/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol/0002-build-sys-Add-m4-file-for-AX_CXX_COMPILE_STDCXX_11.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol/0002-build-sys-Add-m4-file-for-AX_CXX_COMPILE_STDCXX_11.patch
rename to meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol/0002-build-sys-Add-m4-file-for-AX_CXX_COMPILE_STDCXX_11.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_3.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_3.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_3.0.bb
rename to meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_3.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb b/meta-openembedded/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb
rename to meta-openembedded/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch
rename to meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-buildsystem-do-not-assume-building-in-source-tree.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-buildsystem-do-not-assume-building-in-source-tree.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-buildsystem-do-not-assume-building-in-source-tree.patch
rename to meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-buildsystem-do-not-assume-building-in-source-tree.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-ir-ctl-Define-TEMP_FAILURE_RETRY-if-undefined.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-ir-ctl-Define-TEMP_FAILURE_RETRY-if-undefined.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-ir-ctl-Define-TEMP_FAILURE_RETRY-if-undefined.patch
rename to meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-ir-ctl-Define-TEMP_FAILURE_RETRY-if-undefined.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch
rename to meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-contrib-test-Link-mc_nextgen_test-with-libargp-if-ne.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-v4l2-ctl-Do-not-use-getsubopt.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-v4l2-ctl-Do-not-use-getsubopt.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-v4l2-ctl-Do-not-use-getsubopt.patch
rename to meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0003-v4l2-ctl-Do-not-use-getsubopt.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/export-mediactl-headers.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/export-mediactl-headers.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/export-mediactl-headers.patch
rename to meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/export-mediactl-headers.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/mediactl-pkgconfig.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/mediactl-pkgconfig.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/mediactl-pkgconfig.patch
rename to meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/mediactl-pkgconfig.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.12.3.bb b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.12.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.12.3.bb
rename to meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.12.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/yavta/0001-Add-stdout-mode-to-allow-streaming-over-the-network-.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/yavta/0001-Add-stdout-mode-to-allow-streaming-over-the-network-.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/yavta/0001-Add-stdout-mode-to-allow-streaming-over-the-network-.patch
rename to meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/yavta/0001-Add-stdout-mode-to-allow-streaming-over-the-network-.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb
rename to meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/wavpack/wavpack_4.60.1.bb b/meta-openembedded/meta-oe/recipes-multimedia/wavpack/wavpack_4.60.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/wavpack/wavpack_4.60.1.bb
rename to meta-openembedded/meta-oe/recipes-multimedia/wavpack/wavpack_4.60.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch b/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch
rename to meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.6.1.bb b/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.6.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.6.1.bb
rename to meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.6.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/xpext/xpext/auxdir.patch b/meta-openembedded/meta-oe/recipes-multimedia/xpext/xpext/auxdir.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/xpext/xpext/auxdir.patch
rename to meta-openembedded/meta-oe/recipes-multimedia/xpext/xpext/auxdir.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/xpext/xpext_1.0-5.bb b/meta-openembedded/meta-oe/recipes-multimedia/xpext/xpext_1.0-5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/xpext/xpext_1.0-5.bb
rename to meta-openembedded/meta-oe/recipes-multimedia/xpext/xpext_1.0-5.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/xsp/xsp/xsp-fix-pc.patch b/meta-openembedded/meta-oe/recipes-multimedia/xsp/xsp/xsp-fix-pc.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/xsp/xsp/xsp-fix-pc.patch
rename to meta-openembedded/meta-oe/recipes-multimedia/xsp/xsp/xsp-fix-pc.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-multimedia/xsp/xsp_1.0.0-8.bb b/meta-openembedded/meta-oe/recipes-multimedia/xsp/xsp_1.0.0-8.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-multimedia/xsp/xsp_1.0.0-8.bb
rename to meta-openembedded/meta-oe/recipes-multimedia/xsp/xsp_1.0.0-8.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.4.4.bb b/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.4.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.4.4.bb
rename to meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.4.4.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-navigation/geos/files/fix-gcc6-isnan.patch b/meta-openembedded/meta-oe/recipes-navigation/geos/files/fix-gcc6-isnan.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-navigation/geos/files/fix-gcc6-isnan.patch
rename to meta-openembedded/meta-oe/recipes-navigation/geos/files/fix-gcc6-isnan.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-navigation/geos/files/geos-config-Add-includedir-variable.patch b/meta-openembedded/meta-oe/recipes-navigation/geos/files/geos-config-Add-includedir-variable.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-navigation/geos/files/geos-config-Add-includedir-variable.patch
rename to meta-openembedded/meta-oe/recipes-navigation/geos/files/geos-config-Add-includedir-variable.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-navigation/geos/geos.inc b/meta-openembedded/meta-oe/recipes-navigation/geos/geos.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-navigation/geos/geos.inc
rename to meta-openembedded/meta-oe/recipes-navigation/geos/geos.inc
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.4.2.bb b/meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.4.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.4.2.bb
rename to meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.4.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-3.17/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-3.17/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-3.17/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch
rename to meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-3.17/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-3.17/0001-include-sys-ttydefaults.h.patch b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-3.17/0001-include-sys-ttydefaults.h.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-3.17/0001-include-sys-ttydefaults.h.patch
rename to meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-3.17/0001-include-sys-ttydefaults.h.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-3.17/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-3.17/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-3.17/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch
rename to meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-3.17/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb
rename to meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.17.bb b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.17.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.17.bb
rename to meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.17.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite-4.2.0/geos-config.patch b/meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite-4.2.0/geos-config.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite-4.2.0/geos-config.patch
rename to meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite-4.2.0/geos-config.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite_4.2.0.bb b/meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite_4.2.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite_4.2.0.bb
rename to meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite_4.2.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery/0001-orrery-Fix-sprintf-format.patch b/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery/0001-orrery-Fix-sprintf-format.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery/0001-orrery-Fix-sprintf-format.patch
rename to meta-openembedded/meta-oe/recipes-navigation/orrery/orrery/0001-orrery-Fix-sprintf-format.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery/orrery.png b/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery/orrery.png
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery/orrery.png
rename to meta-openembedded/meta-oe/recipes-navigation/orrery/orrery/orrery.png
Binary files differ
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery/use.GdkPixbuf.patch b/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery/use.GdkPixbuf.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery/use.GdkPixbuf.patch
rename to meta-openembedded/meta-oe/recipes-navigation/orrery/orrery/use.GdkPixbuf.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery_2.7.bb b/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery_2.7.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery_2.7.bb
rename to meta-openembedded/meta-oe/recipes-navigation/orrery/orrery_2.7.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-navigation/proj/proj_4.9.3.bb b/meta-openembedded/meta-oe/recipes-navigation/proj/proj_4.9.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-navigation/proj/proj_4.9.3.bb
rename to meta-openembedded/meta-oe/recipes-navigation/proj/proj_4.9.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch b/meta-openembedded/meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch
rename to meta-openembedded/meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb b/meta-openembedded/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb
rename to meta-openembedded/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-security/tomoyo-tools/tomoyo-tools_2.5.0.bb b/meta-openembedded/meta-oe/recipes-security/tomoyo-tools/tomoyo-tools_2.5.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-security/tomoyo-tools/tomoyo-tools_2.5.0.bb
rename to meta-openembedded/meta-oe/recipes-security/tomoyo-tools/tomoyo-tools_2.5.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-shells/dash/dash/0001-Fix-printf-format-errors-with-clang.patch b/meta-openembedded/meta-oe/recipes-shells/dash/dash/0001-Fix-printf-format-errors-with-clang.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-shells/dash/dash/0001-Fix-printf-format-errors-with-clang.patch
rename to meta-openembedded/meta-oe/recipes-shells/dash/dash/0001-Fix-printf-format-errors-with-clang.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-shells/dash/dash_0.5.9.1.bb b/meta-openembedded/meta-oe/recipes-shells/dash/dash_0.5.9.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-shells/dash/dash_0.5.9.1.bb
rename to meta-openembedded/meta-oe/recipes-shells/dash/dash_0.5.9.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-shells/tcsh/tcsh/0001-Enable-system-malloc-on-all-linux.patch b/meta-openembedded/meta-oe/recipes-shells/tcsh/tcsh/0001-Enable-system-malloc-on-all-linux.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-shells/tcsh/tcsh/0001-Enable-system-malloc-on-all-linux.patch
rename to meta-openembedded/meta-oe/recipes-shells/tcsh/tcsh/0001-Enable-system-malloc-on-all-linux.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-shells/tcsh/tcsh/0002-Add-debian-csh-scripts.patch b/meta-openembedded/meta-oe/recipes-shells/tcsh/tcsh/0002-Add-debian-csh-scripts.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-shells/tcsh/tcsh/0002-Add-debian-csh-scripts.patch
rename to meta-openembedded/meta-oe/recipes-shells/tcsh/tcsh/0002-Add-debian-csh-scripts.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-shells/tcsh/tcsh_6.20.00.bb b/meta-openembedded/meta-oe/recipes-shells/tcsh/tcsh_6.20.00.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-shells/tcsh/tcsh_6.20.00.bb
rename to meta-openembedded/meta-oe/recipes-shells/tcsh/tcsh_6.20.00.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-shells/zsh/zsh_5.4.2.bb b/meta-openembedded/meta-oe/recipes-shells/zsh/zsh_5.4.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-shells/zsh/zsh_5.4.2.bb
rename to meta-openembedded/meta-oe/recipes-shells/zsh/zsh_5.4.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/anthy/anthy/2ch_t.patch b/meta-openembedded/meta-oe/recipes-support/anthy/anthy/2ch_t.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/anthy/anthy/2ch_t.patch
rename to meta-openembedded/meta-oe/recipes-support/anthy/anthy/2ch_t.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/anthy/anthy/native-helpers.patch b/meta-openembedded/meta-oe/recipes-support/anthy/anthy/native-helpers.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/anthy/anthy/native-helpers.patch
rename to meta-openembedded/meta-oe/recipes-support/anthy/anthy/native-helpers.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/anthy/anthy/not_build_elc.patch b/meta-openembedded/meta-oe/recipes-support/anthy/anthy/not_build_elc.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/anthy/anthy/not_build_elc.patch
rename to meta-openembedded/meta-oe/recipes-support/anthy/anthy/not_build_elc.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/anthy/anthy/target-helpers.patch b/meta-openembedded/meta-oe/recipes-support/anthy/anthy/target-helpers.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/anthy/anthy/target-helpers.patch
rename to meta-openembedded/meta-oe/recipes-support/anthy/anthy/target-helpers.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/anthy/anthy_9100h.bb b/meta-openembedded/meta-oe/recipes-support/anthy/anthy_9100h.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/anthy/anthy_9100h.bb
rename to meta-openembedded/meta-oe/recipes-support/anthy/anthy_9100h.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/asio/asio.inc b/meta-openembedded/meta-oe/recipes-support/asio/asio.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/asio/asio.inc
rename to meta-openembedded/meta-oe/recipes-support/asio/asio.inc
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/asio/asio/0001-Automatically-handle-glibc-variant-of-strerror_r-wit.patch b/meta-openembedded/meta-oe/recipes-support/asio/asio/0001-Automatically-handle-glibc-variant-of-strerror_r-wit.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/asio/asio/0001-Automatically-handle-glibc-variant-of-strerror_r-wit.patch
rename to meta-openembedded/meta-oe/recipes-support/asio/asio/0001-Automatically-handle-glibc-variant-of-strerror_r-wit.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/asio/asio/0001-use-POSIX-poll.h-instead-of-sys-poll.h.patch b/meta-openembedded/meta-oe/recipes-support/asio/asio/0001-use-POSIX-poll.h-instead-of-sys-poll.h.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/asio/asio/0001-use-POSIX-poll.h-instead-of-sys-poll.h.patch
rename to meta-openembedded/meta-oe/recipes-support/asio/asio/0001-use-POSIX-poll.h-instead-of-sys-poll.h.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/asio/asio_1.10.6.bb b/meta-openembedded/meta-oe/recipes-support/asio/asio_1.10.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/asio/asio_1.10.6.bb
rename to meta-openembedded/meta-oe/recipes-support/asio/asio_1.10.6.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/atop/atop/0001-include-missing-header-files.patch b/meta-openembedded/meta-oe/recipes-support/atop/atop/0001-include-missing-header-files.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/atop/atop/0001-include-missing-header-files.patch
rename to meta-openembedded/meta-oe/recipes-support/atop/atop/0001-include-missing-header-files.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/atop/atop/fix-permissions.patch b/meta-openembedded/meta-oe/recipes-support/atop/atop/fix-permissions.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/atop/atop/fix-permissions.patch
rename to meta-openembedded/meta-oe/recipes-support/atop/atop/fix-permissions.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/atop/atop/remove-bashisms.patch b/meta-openembedded/meta-oe/recipes-support/atop/atop/remove-bashisms.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/atop/atop/remove-bashisms.patch
rename to meta-openembedded/meta-oe/recipes-support/atop/atop/remove-bashisms.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/atop/atop/sysvinit-implement-status.patch b/meta-openembedded/meta-oe/recipes-support/atop/atop/sysvinit-implement-status.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/atop/atop/sysvinit-implement-status.patch
rename to meta-openembedded/meta-oe/recipes-support/atop/atop/sysvinit-implement-status.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/atop/atop/volatiles.99_atop b/meta-openembedded/meta-oe/recipes-support/atop/atop/volatiles.99_atop
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/atop/atop/volatiles.99_atop
rename to meta-openembedded/meta-oe/recipes-support/atop/atop/volatiles.99_atop
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/atop/atop/volatiles.atop.conf b/meta-openembedded/meta-oe/recipes-support/atop/atop/volatiles.atop.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/atop/atop/volatiles.atop.conf
rename to meta-openembedded/meta-oe/recipes-support/atop/atop/volatiles.atop.conf
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/atop/atop_2.2.3.bb b/meta-openembedded/meta-oe/recipes-support/atop/atop_2.2.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/atop/atop_2.2.3.bb
rename to meta-openembedded/meta-oe/recipes-support/atop/atop_2.2.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/augeas/augeas.inc b/meta-openembedded/meta-oe/recipes-support/augeas/augeas.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/augeas/augeas.inc
rename to meta-openembedded/meta-oe/recipes-support/augeas/augeas.inc
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/augeas/augeas/0001-Unset-need_charset_alias-when-building-for-musl.patch b/meta-openembedded/meta-oe/recipes-support/augeas/augeas/0001-Unset-need_charset_alias-when-building-for-musl.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/augeas/augeas/0001-Unset-need_charset_alias-when-building-for-musl.patch
rename to meta-openembedded/meta-oe/recipes-support/augeas/augeas/0001-Unset-need_charset_alias-when-building-for-musl.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/augeas/augeas/add-missing-argz-conditional.patch b/meta-openembedded/meta-oe/recipes-support/augeas/augeas/add-missing-argz-conditional.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/augeas/augeas/add-missing-argz-conditional.patch
rename to meta-openembedded/meta-oe/recipes-support/augeas/augeas/add-missing-argz-conditional.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/augeas/augeas/sepbuildfix.patch b/meta-openembedded/meta-oe/recipes-support/augeas/augeas/sepbuildfix.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/augeas/augeas/sepbuildfix.patch
rename to meta-openembedded/meta-oe/recipes-support/augeas/augeas/sepbuildfix.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/augeas/augeas_1.5.0.bb b/meta-openembedded/meta-oe/recipes-support/augeas/augeas_1.5.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/augeas/augeas_1.5.0.bb
rename to meta-openembedded/meta-oe/recipes-support/augeas/augeas_1.5.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/avro/avro-c/0001-avro-c-Fix-build-with-clang-compiler.patch b/meta-openembedded/meta-oe/recipes-support/avro/avro-c/0001-avro-c-Fix-build-with-clang-compiler.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/avro/avro-c/0001-avro-c-Fix-build-with-clang-compiler.patch
rename to meta-openembedded/meta-oe/recipes-support/avro/avro-c/0001-avro-c-Fix-build-with-clang-compiler.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/avro/avro-c_1.8.1.bb b/meta-openembedded/meta-oe/recipes-support/avro/avro-c_1.8.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/avro/avro-c_1.8.1.bb
rename to meta-openembedded/meta-oe/recipes-support/avro/avro-c_1.8.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc/0001-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch b/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc/0001-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc/0001-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch
rename to meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc/0001-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc/musl_header_fix.patch b/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc/musl_header_fix.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc/musl_header_fix.patch
rename to meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc/musl_header_fix.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc_7.6.0.bb b/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc_7.6.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc_7.6.0.bb
rename to meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc_7.6.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/frame/pessimizing-move.patch b/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/frame/pessimizing-move.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/frame/pessimizing-move.patch
rename to meta-openembedded/meta-oe/recipes-support/canonical-multitouch/frame/pessimizing-move.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/frame_2.5.0.bb b/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/frame_2.5.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/frame_2.5.0.bb
rename to meta-openembedded/meta-oe/recipes-support/canonical-multitouch/frame_2.5.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/geis/0001-libgeis-Compare-the-first-character-of-string-to-nul.patch b/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/geis/0001-libgeis-Compare-the-first-character-of-string-to-nul.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/geis/0001-libgeis-Compare-the-first-character-of-string-to-nul.patch
rename to meta-openembedded/meta-oe/recipes-support/canonical-multitouch/geis/0001-libgeis-Compare-the-first-character-of-string-to-nul.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/geis/fix-indentation-for-gcc6.patch b/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/geis/fix-indentation-for-gcc6.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/geis/fix-indentation-for-gcc6.patch
rename to meta-openembedded/meta-oe/recipes-support/canonical-multitouch/geis/fix-indentation-for-gcc6.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb b/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb
rename to meta-openembedded/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb b/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb
rename to meta-openembedded/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/ccid/ccid/no-dep-on-libfl.patch b/meta-openembedded/meta-oe/recipes-support/ccid/ccid/no-dep-on-libfl.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/ccid/ccid/no-dep-on-libfl.patch
rename to meta-openembedded/meta-oe/recipes-support/ccid/ccid/no-dep-on-libfl.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.24.bb b/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.24.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.24.bb
rename to meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.4.24.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb b/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb
rename to meta-openembedded/meta-oe/recipes-support/ceres-solver/ceres-solver_1.14.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/ckermit/ckermit_302.bb b/meta-openembedded/meta-oe/recipes-support/ckermit/ckermit_302.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/ckermit/ckermit_302.bb
rename to meta-openembedded/meta-oe/recipes-support/ckermit/ckermit_302.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest-2.10.2/fix-cmake-install.patch b/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest-2.10.2/fix-cmake-install.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest-2.10.2/fix-cmake-install.patch
rename to meta-openembedded/meta-oe/recipes-support/cpprest/cpprest-2.10.2/fix-cmake-install.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.2.bb b/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.2.bb
rename to meta-openembedded/meta-oe/recipes-support/cpprest/cpprest_2.10.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb b/meta-openembedded/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb
rename to meta-openembedded/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/daemonize/daemonize_git.bb b/meta-openembedded/meta-oe/recipes-support/daemonize/daemonize_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/daemonize/daemonize_git.bb
rename to meta-openembedded/meta-oe/recipes-support/daemonize/daemonize_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/daemonize/files/fix-ldflags-for-gnuhash.patch b/meta-openembedded/meta-oe/recipes-support/daemonize/files/fix-ldflags-for-gnuhash.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/daemonize/files/fix-ldflags-for-gnuhash.patch
rename to meta-openembedded/meta-oe/recipes-support/daemonize/files/fix-ldflags-for-gnuhash.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-Fix-QA-Issue.patch b/meta-openembedded/meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-Fix-QA-Issue.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-Fix-QA-Issue.patch
rename to meta-openembedded/meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-Fix-QA-Issue.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-native-Fix-a-warning.patch b/meta-openembedded/meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-native-Fix-a-warning.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-native-Fix-a-warning.patch
rename to meta-openembedded/meta-oe/recipes-support/daemontools/daemontools/0001-daemontools-native-Fix-a-warning.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/daemontools/daemontools/0001-error.h-include-errno.h-instead-of-extern-int.diff b/meta-openembedded/meta-oe/recipes-support/daemontools/daemontools/0001-error.h-include-errno.h-instead-of-extern-int.diff
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/daemontools/daemontools/0001-error.h-include-errno.h-instead-of-extern-int.diff
rename to meta-openembedded/meta-oe/recipes-support/daemontools/daemontools/0001-error.h-include-errno.h-instead-of-extern-int.diff
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/daemontools/daemontools/0002-supervise.c-.-supervise-may-be-a-symlink-if-it-s-da.diff b/meta-openembedded/meta-oe/recipes-support/daemontools/daemontools/0002-supervise.c-.-supervise-may-be-a-symlink-if-it-s-da.diff
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/daemontools/daemontools/0002-supervise.c-.-supervise-may-be-a-symlink-if-it-s-da.diff
rename to meta-openembedded/meta-oe/recipes-support/daemontools/daemontools/0002-supervise.c-.-supervise-may-be-a-symlink-if-it-s-da.diff
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/daemontools/daemontools/cross-compile.patch b/meta-openembedded/meta-oe/recipes-support/daemontools/daemontools/cross-compile.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/daemontools/daemontools/cross-compile.patch
rename to meta-openembedded/meta-oe/recipes-support/daemontools/daemontools/cross-compile.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/daemontools/daemontools_0.76.bb b/meta-openembedded/meta-oe/recipes-support/daemontools/daemontools_0.76.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/daemontools/daemontools_0.76.bb
rename to meta-openembedded/meta-oe/recipes-support/daemontools/daemontools_0.76.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/debsums/debsums_2.2.2.bb b/meta-openembedded/meta-oe/recipes-support/debsums/debsums_2.2.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/debsums/debsums_2.2.2.bb
rename to meta-openembedded/meta-oe/recipes-support/debsums/debsums_2.2.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/devmem2/devmem2.bb b/meta-openembedded/meta-oe/recipes-support/devmem2/devmem2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/devmem2/devmem2.bb
rename to meta-openembedded/meta-oe/recipes-support/devmem2/devmem2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/devmem2/devmem2/devmem2-fixups-2.patch b/meta-openembedded/meta-oe/recipes-support/devmem2/devmem2/devmem2-fixups-2.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/devmem2/devmem2/devmem2-fixups-2.patch
rename to meta-openembedded/meta-oe/recipes-support/devmem2/devmem2/devmem2-fixups-2.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb b/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb
rename to meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util/0001-Revert-Makefile.am-Drop-static-dfu-util.patch b/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util/0001-Revert-Makefile.am-Drop-static-dfu-util.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util/0001-Revert-Makefile.am-Drop-static-dfu-util.patch
rename to meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util/0001-Revert-Makefile.am-Drop-static-dfu-util.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util_0.9.bb b/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util_0.9.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util_0.9.bb
rename to meta-openembedded/meta-oe/recipes-support/dfu-util/dfu-util_0.9.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/digitemp/digitemp_git.bb b/meta-openembedded/meta-oe/recipes-support/digitemp/digitemp_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/digitemp/digitemp_git.bb
rename to meta-openembedded/meta-oe/recipes-support/digitemp/digitemp_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/dos2unix/dos2unix_7.4.0.bb b/meta-openembedded/meta-oe/recipes-support/dos2unix/dos2unix_7.4.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/dos2unix/dos2unix_7.4.0.bb
rename to meta-openembedded/meta-oe/recipes-support/dos2unix/dos2unix_7.4.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/dstat/dstat_0.7.3.bb b/meta-openembedded/meta-oe/recipes-support/dstat/dstat_0.7.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/dstat/dstat_0.7.3.bb
rename to meta-openembedded/meta-oe/recipes-support/dstat/dstat_0.7.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/eject/eject/eject-2.1.1-verbose.patch b/meta-openembedded/meta-oe/recipes-support/eject/eject/eject-2.1.1-verbose.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/eject/eject/eject-2.1.1-verbose.patch
rename to meta-openembedded/meta-oe/recipes-support/eject/eject/eject-2.1.1-verbose.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/eject/eject/eject-2.1.5-error-return.patch b/meta-openembedded/meta-oe/recipes-support/eject/eject/eject-2.1.5-error-return.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/eject/eject/eject-2.1.5-error-return.patch
rename to meta-openembedded/meta-oe/recipes-support/eject/eject/eject-2.1.5-error-return.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/eject/eject/eject-2.1.5-spaces.patch b/meta-openembedded/meta-oe/recipes-support/eject/eject/eject-2.1.5-spaces.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/eject/eject/eject-2.1.5-spaces.patch
rename to meta-openembedded/meta-oe/recipes-support/eject/eject/eject-2.1.5-spaces.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/eject/eject/eject-timeout.patch b/meta-openembedded/meta-oe/recipes-support/eject/eject/eject-timeout.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/eject/eject/eject-timeout.patch
rename to meta-openembedded/meta-oe/recipes-support/eject/eject/eject-timeout.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/eject/eject_2.1.5.bb b/meta-openembedded/meta-oe/recipes-support/eject/eject_2.1.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/eject/eject_2.1.5.bb
rename to meta-openembedded/meta-oe/recipes-support/eject/eject_2.1.5.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/enca/enca/configure-hack.patch b/meta-openembedded/meta-oe/recipes-support/enca/enca/configure-hack.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/enca/enca/configure-hack.patch
rename to meta-openembedded/meta-oe/recipes-support/enca/enca/configure-hack.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/enca/enca/configure-remove-dumbness.patch b/meta-openembedded/meta-oe/recipes-support/enca/enca/configure-remove-dumbness.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/enca/enca/configure-remove-dumbness.patch
rename to meta-openembedded/meta-oe/recipes-support/enca/enca/configure-remove-dumbness.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/enca/enca/dont-run-tests.patch b/meta-openembedded/meta-oe/recipes-support/enca/enca/dont-run-tests.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/enca/enca/dont-run-tests.patch
rename to meta-openembedded/meta-oe/recipes-support/enca/enca/dont-run-tests.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/enca/enca/libenca-003-iconv.patch b/meta-openembedded/meta-oe/recipes-support/enca/enca/libenca-003-iconv.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/enca/enca/libenca-003-iconv.patch
rename to meta-openembedded/meta-oe/recipes-support/enca/enca/libenca-003-iconv.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/enca/enca/makefile-remove-tools.patch b/meta-openembedded/meta-oe/recipes-support/enca/enca/makefile-remove-tools.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/enca/enca/makefile-remove-tools.patch
rename to meta-openembedded/meta-oe/recipes-support/enca/enca/makefile-remove-tools.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/enca/enca_1.9.bb b/meta-openembedded/meta-oe/recipes-support/enca/enca_1.9.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/enca/enca_1.9.bb
rename to meta-openembedded/meta-oe/recipes-support/enca/enca_1.9.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/epeg/epeg_git.bb b/meta-openembedded/meta-oe/recipes-support/epeg/epeg_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/epeg/epeg_git.bb
rename to meta-openembedded/meta-oe/recipes-support/epeg/epeg_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/espeak/espeak-data_1.48.04.bb b/meta-openembedded/meta-oe/recipes-support/espeak/espeak-data_1.48.04.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/espeak/espeak-data_1.48.04.bb
rename to meta-openembedded/meta-oe/recipes-support/espeak/espeak-data_1.48.04.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/espeak/espeak.inc b/meta-openembedded/meta-oe/recipes-support/espeak/espeak.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/espeak/espeak.inc
rename to meta-openembedded/meta-oe/recipes-support/espeak/espeak.inc
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/espeak/espeak_1.48.04.bb b/meta-openembedded/meta-oe/recipes-support/espeak/espeak_1.48.04.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/espeak/espeak_1.48.04.bb
rename to meta-openembedded/meta-oe/recipes-support/espeak/espeak_1.48.04.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/espeak/files/gcc-narrowing-warning-fix.patch b/meta-openembedded/meta-oe/recipes-support/espeak/files/gcc-narrowing-warning-fix.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/espeak/files/gcc-narrowing-warning-fix.patch
rename to meta-openembedded/meta-oe/recipes-support/espeak/files/gcc-narrowing-warning-fix.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/eventlog/eventlog_0.2.13.bb b/meta-openembedded/meta-oe/recipes-support/eventlog/eventlog_0.2.13.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/eventlog/eventlog_0.2.13.bb
rename to meta-openembedded/meta-oe/recipes-support/eventlog/eventlog_0.2.13.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/farsight/libnice_0.1.13.bb b/meta-openembedded/meta-oe/recipes-support/farsight/libnice_0.1.13.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/farsight/libnice_0.1.13.bb
rename to meta-openembedded/meta-oe/recipes-support/farsight/libnice_0.1.13.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/fbset/fbset-2.1/fbset-2.1-fix-makefile-dep.patch b/meta-openembedded/meta-oe/recipes-support/fbset/fbset-2.1/fbset-2.1-fix-makefile-dep.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/fbset/fbset-2.1/fbset-2.1-fix-makefile-dep.patch
rename to meta-openembedded/meta-oe/recipes-support/fbset/fbset-2.1/fbset-2.1-fix-makefile-dep.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/fbset/fbset-2.1/makefile.patch b/meta-openembedded/meta-oe/recipes-support/fbset/fbset-2.1/makefile.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/fbset/fbset-2.1/makefile.patch
rename to meta-openembedded/meta-oe/recipes-support/fbset/fbset-2.1/makefile.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/fbset/fbset-modes.bb b/meta-openembedded/meta-oe/recipes-support/fbset/fbset-modes.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/fbset/fbset-modes.bb
rename to meta-openembedded/meta-oe/recipes-support/fbset/fbset-modes.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/fbset/fbset-modes/fb.modes b/meta-openembedded/meta-oe/recipes-support/fbset/fbset-modes/fb.modes
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/fbset/fbset-modes/fb.modes
rename to meta-openembedded/meta-oe/recipes-support/fbset/fbset-modes/fb.modes
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/fbset/fbset-modes/om-gta01/fb.modes b/meta-openembedded/meta-oe/recipes-support/fbset/fbset-modes/om-gta01/fb.modes
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/fbset/fbset-modes/om-gta01/fb.modes
rename to meta-openembedded/meta-oe/recipes-support/fbset/fbset-modes/om-gta01/fb.modes
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/fbset/fbset-modes/omap3-pandora/fb.modes b/meta-openembedded/meta-oe/recipes-support/fbset/fbset-modes/omap3-pandora/fb.modes
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/fbset/fbset-modes/omap3-pandora/fb.modes
rename to meta-openembedded/meta-oe/recipes-support/fbset/fbset-modes/omap3-pandora/fb.modes
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/fbset/fbset-modes/qemuarm/fb.modes b/meta-openembedded/meta-oe/recipes-support/fbset/fbset-modes/qemuarm/fb.modes
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/fbset/fbset-modes/qemuarm/fb.modes
rename to meta-openembedded/meta-oe/recipes-support/fbset/fbset-modes/qemuarm/fb.modes
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/fbset/fbset-modes/qemumips/fb.modes b/meta-openembedded/meta-oe/recipes-support/fbset/fbset-modes/qemumips/fb.modes
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/fbset/fbset-modes/qemumips/fb.modes
rename to meta-openembedded/meta-oe/recipes-support/fbset/fbset-modes/qemumips/fb.modes
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/fbset/fbset/0001-fbset-including-asm-types.h-is-needed-on-all-linux-s.patch b/meta-openembedded/meta-oe/recipes-support/fbset/fbset/0001-fbset-including-asm-types.h-is-needed-on-all-linux-s.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/fbset/fbset/0001-fbset-including-asm-types.h-is-needed-on-all-linux-s.patch
rename to meta-openembedded/meta-oe/recipes-support/fbset/fbset/0001-fbset-including-asm-types.h-is-needed-on-all-linux-s.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/fbset/fbset_2.1.bb b/meta-openembedded/meta-oe/recipes-support/fbset/fbset_2.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/fbset/fbset_2.1.bb
rename to meta-openembedded/meta-oe/recipes-support/fbset/fbset_2.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/fftw/fftw/0001-NEON-autodetection-segfaults-assume-neon-present.patch b/meta-openembedded/meta-oe/recipes-support/fftw/fftw/0001-NEON-autodetection-segfaults-assume-neon-present.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/fftw/fftw/0001-NEON-autodetection-segfaults-assume-neon-present.patch
rename to meta-openembedded/meta-oe/recipes-support/fftw/fftw/0001-NEON-autodetection-segfaults-assume-neon-present.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/fftw/fftw_3.3.7.bb b/meta-openembedded/meta-oe/recipes-support/fftw/fftw_3.3.7.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/fftw/fftw_3.3.7.bb
rename to meta-openembedded/meta-oe/recipes-support/fftw/fftw_3.3.7.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/fltk/fltk-native.bb b/meta-openembedded/meta-oe/recipes-support/fltk/fltk-native.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/fltk/fltk-native.bb
rename to meta-openembedded/meta-oe/recipes-support/fltk/fltk-native.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/fltk/fltk.bb b/meta-openembedded/meta-oe/recipes-support/fltk/fltk.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/fltk/fltk.bb
rename to meta-openembedded/meta-oe/recipes-support/fltk/fltk.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/fltk/fltk.inc b/meta-openembedded/meta-oe/recipes-support/fltk/fltk.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/fltk/fltk.inc
rename to meta-openembedded/meta-oe/recipes-support/fltk/fltk.inc
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch b/meta-openembedded/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch
rename to meta-openembedded/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/fltk/fltk/0002-always-build-fluid-and-export-pointers.patch b/meta-openembedded/meta-oe/recipes-support/fltk/fltk/0002-always-build-fluid-and-export-pointers.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/fltk/fltk/0002-always-build-fluid-and-export-pointers.patch
rename to meta-openembedded/meta-oe/recipes-support/fltk/fltk/0002-always-build-fluid-and-export-pointers.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/fltk/fltk/0003-CMake-build-Force-shared-libs-with-unsuffixed-names.patch b/meta-openembedded/meta-oe/recipes-support/fltk/fltk/0003-CMake-build-Force-shared-libs-with-unsuffixed-names.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/fltk/fltk/0003-CMake-build-Force-shared-libs-with-unsuffixed-names.patch
rename to meta-openembedded/meta-oe/recipes-support/fltk/fltk/0003-CMake-build-Force-shared-libs-with-unsuffixed-names.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/fltk/fltk/disable_test.patch b/meta-openembedded/meta-oe/recipes-support/fltk/fltk/disable_test.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/fltk/fltk/disable_test.patch
rename to meta-openembedded/meta-oe/recipes-support/fltk/fltk/disable_test.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/fltk/fltk/fltk-no-freetype-config.patch b/meta-openembedded/meta-oe/recipes-support/fltk/fltk/fltk-no-freetype-config.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/fltk/fltk/fltk-no-freetype-config.patch
rename to meta-openembedded/meta-oe/recipes-support/fltk/fltk/fltk-no-freetype-config.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-gstreamer-1.0-detection.patch b/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-gstreamer-1.0-detection.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-gstreamer-1.0-detection.patch
rename to meta-openembedded/meta-oe/recipes-support/freerdp/freerdp/0001-Fix-gstreamer-1.0-detection.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp/winpr-makecert-Build-with-install-RPATH.patch b/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp/winpr-makecert-Build-with-install-RPATH.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp/winpr-makecert-Build-with-install-RPATH.patch
rename to meta-openembedded/meta-oe/recipes-support/freerdp/freerdp/winpr-makecert-Build-with-install-RPATH.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_git.bb b/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_git.bb
rename to meta-openembedded/meta-oe/recipes-support/freerdp/freerdp_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/gd/gd_2.2.5.bb b/meta-openembedded/meta-oe/recipes-support/gd/gd_2.2.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/gd/gd_2.2.5.bb
rename to meta-openembedded/meta-oe/recipes-support/gd/gd_2.2.5.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/gflags/gflags_2.2.0.bb b/meta-openembedded/meta-oe/recipes-support/gflags/gflags_2.2.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/gflags/gflags_2.2.0.bb
rename to meta-openembedded/meta-oe/recipes-support/gflags/gflags_2.2.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/glog/glog/0001-configure.ac-Allow-user-to-disable-gflags.patch b/meta-openembedded/meta-oe/recipes-support/glog/glog/0001-configure.ac-Allow-user-to-disable-gflags.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/glog/glog/0001-configure.ac-Allow-user-to-disable-gflags.patch
rename to meta-openembedded/meta-oe/recipes-support/glog/glog/0001-configure.ac-Allow-user-to-disable-gflags.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/glog/glog_0.3.4.bb b/meta-openembedded/meta-oe/recipes-support/glog/glog_0.3.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/glog/glog_0.3.4.bb
rename to meta-openembedded/meta-oe/recipes-support/glog/glog_0.3.4.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/gnulib/gnulib_2017-08-20.18.bb b/meta-openembedded/meta-oe/recipes-support/gnulib/gnulib_2017-08-20.18.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/gnulib/gnulib_2017-08-20.18.bb
rename to meta-openembedded/meta-oe/recipes-support/gnulib/gnulib_2017-08-20.18.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-Support-Atomic-ops-on-clang.patch b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-Support-Atomic-ops-on-clang.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-Support-Atomic-ops-on-clang.patch
rename to meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-Support-Atomic-ops-on-clang.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-Use-ucontext_t-instead-of-struct-ucontext.patch b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-Use-ucontext_t-instead-of-struct-ucontext.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-Use-ucontext_t-instead-of-struct-ucontext.patch
rename to meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-Use-ucontext_t-instead-of-struct-ucontext.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch
rename to meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch
rename to meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-fix-build-with-musl-libc.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-include-fcntl.h-for-loff_t-definition.patch b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-include-fcntl.h-for-loff_t-definition.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-include-fcntl.h-for-loff_t-definition.patch
rename to meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/0001-include-fcntl.h-for-loff_t-definition.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/disable_libunwind_aarch64.patch b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/disable_libunwind_aarch64.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/disable_libunwind_aarch64.patch
rename to meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/disable_libunwind_aarch64.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/sgidef.patch b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/sgidef.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/sgidef.patch
rename to meta-openembedded/meta-oe/recipes-support/gperftools/gperftools/sgidef.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb b/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb
rename to meta-openembedded/meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/gpm/gpm/0001-Use-sigemptyset-API-instead-of-__sigemptyset.patch b/meta-openembedded/meta-oe/recipes-support/gpm/gpm/0001-Use-sigemptyset-API-instead-of-__sigemptyset.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/gpm/gpm/0001-Use-sigemptyset-API-instead-of-__sigemptyset.patch
rename to meta-openembedded/meta-oe/recipes-support/gpm/gpm/0001-Use-sigemptyset-API-instead-of-__sigemptyset.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/gpm/gpm/gpm.service.in b/meta-openembedded/meta-oe/recipes-support/gpm/gpm/gpm.service.in
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/gpm/gpm/gpm.service.in
rename to meta-openembedded/meta-oe/recipes-support/gpm/gpm/gpm.service.in
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/gpm/gpm/init b/meta-openembedded/meta-oe/recipes-support/gpm/gpm/init
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/gpm/gpm/init
rename to meta-openembedded/meta-oe/recipes-support/gpm/gpm/init
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/gpm/gpm/no-docs.patch b/meta-openembedded/meta-oe/recipes-support/gpm/gpm/no-docs.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/gpm/gpm/no-docs.patch
rename to meta-openembedded/meta-oe/recipes-support/gpm/gpm/no-docs.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/gpm/gpm/processcreds.patch b/meta-openembedded/meta-oe/recipes-support/gpm/gpm/processcreds.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/gpm/gpm/processcreds.patch
rename to meta-openembedded/meta-oe/recipes-support/gpm/gpm/processcreds.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/gpm/gpm_git.bb b/meta-openembedded/meta-oe/recipes-support/gpm/gpm_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/gpm/gpm_git.bb
rename to meta-openembedded/meta-oe/recipes-support/gpm/gpm_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/gradm/gradm/0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch b/meta-openembedded/meta-oe/recipes-support/gradm/gradm/0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/gradm/gradm/0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch
rename to meta-openembedded/meta-oe/recipes-support/gradm/gradm/0001-Makefile-Append-instead-of-overriding-LDFLAGS.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/gradm/gradm/0001-Makefile-remove-strip.patch b/meta-openembedded/meta-oe/recipes-support/gradm/gradm/0001-Makefile-remove-strip.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/gradm/gradm/0001-Makefile-remove-strip.patch
rename to meta-openembedded/meta-oe/recipes-support/gradm/gradm/0001-Makefile-remove-strip.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/gradm/gradm_3.1.bb b/meta-openembedded/meta-oe/recipes-support/gradm/gradm_3.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/gradm/gradm_3.1.bb
rename to meta-openembedded/meta-oe/recipes-support/gradm/gradm_3.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/gsl/gsl.inc b/meta-openembedded/meta-oe/recipes-support/gsl/gsl.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/gsl/gsl.inc
rename to meta-openembedded/meta-oe/recipes-support/gsl/gsl.inc
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/gsl/gsl_1.15.bb b/meta-openembedded/meta-oe/recipes-support/gsl/gsl_1.15.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/gsl/gsl_1.15.bb
rename to meta-openembedded/meta-oe/recipes-support/gsl/gsl_1.15.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap/0001-Fix-out-of-tree-builds.patch b/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap/0001-Fix-out-of-tree-builds.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap/0001-Fix-out-of-tree-builds.patch
rename to meta-openembedded/meta-oe/recipes-support/gsoap/gsoap/0001-Fix-out-of-tree-builds.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap/0001-stdgsoap2-Fix-build-with-musl.patch b/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap/0001-stdgsoap2-Fix-build-with-musl.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap/0001-stdgsoap2-Fix-build-with-musl.patch
rename to meta-openembedded/meta-oe/recipes-support/gsoap/gsoap/0001-stdgsoap2-Fix-build-with-musl.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap_2.8.51.bb b/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap_2.8.51.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/gsoap/gsoap_2.8.51.bb
rename to meta-openembedded/meta-oe/recipes-support/gsoap/gsoap_2.8.51.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/hddtemp/hddtemp/0001-backtrace-Replace-struct-ucontext-with-ucontext_t.patch b/meta-openembedded/meta-oe/recipes-support/hddtemp/hddtemp/0001-backtrace-Replace-struct-ucontext-with-ucontext_t.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/hddtemp/hddtemp/0001-backtrace-Replace-struct-ucontext-with-ucontext_t.patch
rename to meta-openembedded/meta-oe/recipes-support/hddtemp/hddtemp/0001-backtrace-Replace-struct-ucontext-with-ucontext_t.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-0.3-beta15-autodetect-717479.patch b/meta-openembedded/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-0.3-beta15-autodetect-717479.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-0.3-beta15-autodetect-717479.patch
rename to meta-openembedded/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-0.3-beta15-autodetect-717479.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-no-nls-support.patch b/meta-openembedded/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-no-nls-support.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-no-nls-support.patch
rename to meta-openembedded/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp-no-nls-support.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp.db b/meta-openembedded/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp.db
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp.db
rename to meta-openembedded/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp.db
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff b/meta-openembedded/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff
rename to meta-openembedded/meta-oe/recipes-support/hddtemp/hddtemp/hddtemp_0.3-beta15-52.diff
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/hddtemp/hddtemp/init b/meta-openembedded/meta-oe/recipes-support/hddtemp/hddtemp/init
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/hddtemp/hddtemp/init
rename to meta-openembedded/meta-oe/recipes-support/hddtemp/hddtemp/init
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb b/meta-openembedded/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb
rename to meta-openembedded/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb b/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb
rename to meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch b/meta-openembedded/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch
rename to meta-openembedded/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/htop/htop_2.1.0.bb b/meta-openembedded/meta-oe/recipes-support/htop/htop_2.1.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/htop/htop_2.1.0.bb
rename to meta-openembedded/meta-oe/recipes-support/htop/htop_2.1.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/hunspell/hunspell_1.6.2.bb b/meta-openembedded/meta-oe/recipes-support/hunspell/hunspell_1.6.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/hunspell/hunspell_1.6.2.bb
rename to meta-openembedded/meta-oe/recipes-support/hunspell/hunspell_1.6.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb
rename to meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/iksemel/iksemel/avoid-obsolete-gnutls-apis.patch b/meta-openembedded/meta-oe/recipes-support/iksemel/iksemel/avoid-obsolete-gnutls-apis.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/iksemel/iksemel/avoid-obsolete-gnutls-apis.patch
rename to meta-openembedded/meta-oe/recipes-support/iksemel/iksemel/avoid-obsolete-gnutls-apis.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/iksemel/iksemel/fix-configure-option-parsing.patch b/meta-openembedded/meta-oe/recipes-support/iksemel/iksemel/fix-configure-option-parsing.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/iksemel/iksemel/fix-configure-option-parsing.patch
rename to meta-openembedded/meta-oe/recipes-support/iksemel/iksemel/fix-configure-option-parsing.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/iksemel/iksemel_1.5.bb b/meta-openembedded/meta-oe/recipes-support/iksemel/iksemel_1.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/iksemel/iksemel_1.5.bb
rename to meta-openembedded/meta-oe/recipes-support/iksemel/iksemel_1.5.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.0.7.bb b/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.0.7.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.0.7.bb
rename to meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.0.7.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/inih/libinih_git.bb b/meta-openembedded/meta-oe/recipes-support/inih/libinih_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/inih/libinih_git.bb
rename to meta-openembedded/meta-oe/recipes-support/inih/libinih_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools/inotify-nosys-fix-system-call-number.patch b/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools/inotify-nosys-fix-system-call-number.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools/inotify-nosys-fix-system-call-number.patch
rename to meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools/inotify-nosys-fix-system-call-number.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools/inotifywait-fix-compile-error-with-GCC-6.patch b/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools/inotifywait-fix-compile-error-with-GCC-6.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools/inotifywait-fix-compile-error-with-GCC-6.patch
rename to meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools/inotifywait-fix-compile-error-with-GCC-6.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb b/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb
rename to meta-openembedded/meta-oe/recipes-support/inotify-tools/inotify-tools_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/joe/joe/0001-adjust-signature-of-main.patch b/meta-openembedded/meta-oe/recipes-support/joe/joe/0001-adjust-signature-of-main.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/joe/joe/0001-adjust-signature-of-main.patch
rename to meta-openembedded/meta-oe/recipes-support/joe/joe/0001-adjust-signature-of-main.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/joe/joe_3.1.bb b/meta-openembedded/meta-oe/recipes-support/joe/joe_3.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/joe/joe_3.1.bb
rename to meta-openembedded/meta-oe/recipes-support/joe/joe_3.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/lcms/lcms_2.7.bb b/meta-openembedded/meta-oe/recipes-support/lcms/lcms_2.7.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/lcms/lcms_2.7.bb
rename to meta-openembedded/meta-oe/recipes-support/lcms/lcms_2.7.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/lcov/lcov_1.11.bb b/meta-openembedded/meta-oe/recipes-support/lcov/lcov_1.11.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/lcov/lcov_1.11.bb
rename to meta-openembedded/meta-oe/recipes-support/lcov/lcov_1.11.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libatasmart/files/0001-Makefile.am-add-CFLAGS-and-LDFLAGS-definiton.patch b/meta-openembedded/meta-oe/recipes-support/libatasmart/files/0001-Makefile.am-add-CFLAGS-and-LDFLAGS-definiton.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libatasmart/files/0001-Makefile.am-add-CFLAGS-and-LDFLAGS-definiton.patch
rename to meta-openembedded/meta-oe/recipes-support/libatasmart/files/0001-Makefile.am-add-CFLAGS-and-LDFLAGS-definiton.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb b/meta-openembedded/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb
rename to meta-openembedded/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libbytesize/files/0001-remove-python2-support.patch b/meta-openembedded/meta-oe/recipes-support/libbytesize/files/0001-remove-python2-support.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libbytesize/files/0001-remove-python2-support.patch
rename to meta-openembedded/meta-oe/recipes-support/libbytesize/files/0001-remove-python2-support.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_0.10.bb b/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_0.10.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_0.10.bb
rename to meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_0.10.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libcanberra/files/0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch b/meta-openembedded/meta-oe/recipes-support/libcanberra/files/0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libcanberra/files/0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch
rename to meta-openembedded/meta-oe/recipes-support/libcanberra/files/0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb b/meta-openembedded/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb
rename to meta-openembedded/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb b/meta-openembedded/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb
rename to meta-openembedded/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libee/libee.inc b/meta-openembedded/meta-oe/recipes-support/libee/libee.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libee/libee.inc
rename to meta-openembedded/meta-oe/recipes-support/libee/libee.inc
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libee/libee/ezapi1.sh b/meta-openembedded/meta-oe/recipes-support/libee/libee/ezapi1.sh
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libee/libee/ezapi1.sh
rename to meta-openembedded/meta-oe/recipes-support/libee/libee/ezapi1.sh
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libee/libee/libee-parallel-make.patch b/meta-openembedded/meta-oe/recipes-support/libee/libee/libee-parallel-make.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libee/libee/libee-parallel-make.patch
rename to meta-openembedded/meta-oe/recipes-support/libee/libee/libee-parallel-make.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libee/libee/run-ptest b/meta-openembedded/meta-oe/recipes-support/libee/libee/run-ptest
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libee/libee/run-ptest
rename to meta-openembedded/meta-oe/recipes-support/libee/libee/run-ptest
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libee/libee_0.4.1.bb b/meta-openembedded/meta-oe/recipes-support/libee/libee_0.4.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libee/libee_0.4.1.bb
rename to meta-openembedded/meta-oe/recipes-support/libee/libee_0.4.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.4.bb b/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.4.bb
rename to meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.4.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libestr/libestr_0.1.10.bb b/meta-openembedded/meta-oe/recipes-support/libestr/libestr_0.1.10.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libestr/libestr_0.1.10.bb
rename to meta-openembedded/meta-oe/recipes-support/libestr/libestr_0.1.10.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libftdi/libftdi_1.4.bb b/meta-openembedded/meta-oe/recipes-support/libftdi/libftdi_1.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libftdi/libftdi_1.4.bb
rename to meta-openembedded/meta-oe/recipes-support/libftdi/libftdi_1.4.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_0.24.3.bb b/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_0.24.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_0.24.3.bb
rename to meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_0.24.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod.inc b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod.inc
rename to meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod.inc
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_0.3.3.bb b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_0.3.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_0.3.3.bb
rename to meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_0.3.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.0.1.bb b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.0.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.0.1.bb
rename to meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.0.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb b/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb
rename to meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libjs/libjs-jquery_1.7.2.bb b/meta-openembedded/meta-oe/recipes-support/libjs/libjs-jquery_1.7.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libjs/libjs-jquery_1.7.2.bb
rename to meta-openembedded/meta-oe/recipes-support/libjs/libjs-jquery_1.7.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libjs/libjs-sizzle_1.10.18.bb b/meta-openembedded/meta-oe/recipes-support/libjs/libjs-sizzle_1.10.18.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libjs/libjs-sizzle_1.10.18.bb
rename to meta-openembedded/meta-oe/recipes-support/libjs/libjs-sizzle_1.10.18.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/liblinebreak/liblinebreak_1.2.bb b/meta-openembedded/meta-oe/recipes-support/liblinebreak/liblinebreak_1.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/liblinebreak/liblinebreak_1.2.bb
rename to meta-openembedded/meta-oe/recipes-support/liblinebreak/liblinebreak_1.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.55.bb b/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.55.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.55.bb
rename to meta-openembedded/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.55.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libnih/libnih-1.0.3/0001-signal.c-SIGCLD-and-SIGCHILD-are-same-on-sytem-V-sys.patch b/meta-openembedded/meta-oe/recipes-support/libnih/libnih-1.0.3/0001-signal.c-SIGCLD-and-SIGCHILD-are-same-on-sytem-V-sys.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libnih/libnih-1.0.3/0001-signal.c-SIGCLD-and-SIGCHILD-are-same-on-sytem-V-sys.patch
rename to meta-openembedded/meta-oe/recipes-support/libnih/libnih-1.0.3/0001-signal.c-SIGCLD-and-SIGCHILD-are-same-on-sytem-V-sys.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libnih/libnih-1.0.3/libnih_1.0.3-4ubuntu16.patch b/meta-openembedded/meta-oe/recipes-support/libnih/libnih-1.0.3/libnih_1.0.3-4ubuntu16.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libnih/libnih-1.0.3/libnih_1.0.3-4ubuntu16.patch
rename to meta-openembedded/meta-oe/recipes-support/libnih/libnih-1.0.3/libnih_1.0.3-4ubuntu16.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libnih/libnih_1.0.3.bb b/meta-openembedded/meta-oe/recipes-support/libnih/libnih_1.0.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libnih/libnih_1.0.3.bb
rename to meta-openembedded/meta-oe/recipes-support/libnih/libnih_1.0.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/liboauth/liboauth_1.0.3.bb b/meta-openembedded/meta-oe/recipes-support/liboauth/liboauth_1.0.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/liboauth/liboauth_1.0.3.bb
rename to meta-openembedded/meta-oe/recipes-support/liboauth/liboauth_1.0.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libol/libol/configure.patch b/meta-openembedded/meta-oe/recipes-support/libol/libol/configure.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libol/libol/configure.patch
rename to meta-openembedded/meta-oe/recipes-support/libol/libol/configure.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libol/libol_0.3.18.bb b/meta-openembedded/meta-oe/recipes-support/libol/libol_0.3.18.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libol/libol_0.3.18.bb
rename to meta-openembedded/meta-oe/recipes-support/libol/libol_0.3.18.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/liboop/liboop/explicit_linking.patch b/meta-openembedded/meta-oe/recipes-support/liboop/liboop/explicit_linking.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/liboop/liboop/explicit_linking.patch
rename to meta-openembedded/meta-oe/recipes-support/liboop/liboop/explicit_linking.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/liboop/liboop/new-readline-typedef.patch b/meta-openembedded/meta-oe/recipes-support/liboop/liboop/new-readline-typedef.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/liboop/liboop/new-readline-typedef.patch
rename to meta-openembedded/meta-oe/recipes-support/liboop/liboop/new-readline-typedef.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/liboop/liboop/read_bugfixes.patch b/meta-openembedded/meta-oe/recipes-support/liboop/liboop/read_bugfixes.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/liboop/liboop/read_bugfixes.patch
rename to meta-openembedded/meta-oe/recipes-support/liboop/liboop/read_bugfixes.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/liboop/liboop/tcl_dev.patch b/meta-openembedded/meta-oe/recipes-support/liboop/liboop/tcl_dev.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/liboop/liboop/tcl_dev.patch
rename to meta-openembedded/meta-oe/recipes-support/liboop/liboop/tcl_dev.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/liboop/liboop_1.0.bb b/meta-openembedded/meta-oe/recipes-support/liboop/liboop_1.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/liboop/liboop_1.0.bb
rename to meta-openembedded/meta-oe/recipes-support/liboop/liboop_1.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libp11/libp11_0.4.7.bb b/meta-openembedded/meta-oe/recipes-support/libp11/libp11_0.4.7.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libp11/libp11_0.4.7.bb
rename to meta-openembedded/meta-oe/recipes-support/libp11/libp11_0.4.7.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libraw1394/libraw1394_2.1.2.bb b/meta-openembedded/meta-oe/recipes-support/libraw1394/libraw1394_2.1.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libraw1394/libraw1394_2.1.2.bb
rename to meta-openembedded/meta-oe/recipes-support/libraw1394/libraw1394_2.1.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf/use.pkg-config.for.freetype2.patch b/meta-openembedded/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf/use.pkg-config.for.freetype2.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf/use.pkg-config.for.freetype2.patch
rename to meta-openembedded/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf/use.pkg-config.for.freetype2.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf_2.0.11.bb b/meta-openembedded/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf_2.0.11.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf_2.0.11.bb
rename to meta-openembedded/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf_2.0.11.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf/automake_foreign.patch b/meta-openembedded/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf/automake_foreign.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf/automake_foreign.patch
rename to meta-openembedded/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf/automake_foreign.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf/use.pkg-config.for.freetype2.patch b/meta-openembedded/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf/use.pkg-config.for.freetype2.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf/use.pkg-config.for.freetype2.patch
rename to meta-openembedded/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf/use.pkg-config.for.freetype2.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf_2.0.14.bb b/meta-openembedded/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf_2.0.14.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf_2.0.14.bb
rename to meta-openembedded/meta-oe/recipes-support/libsdl-ttf/libsdl2-ttf_2.0.14.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi/libsmi-fix-the-test-dump-files.patch b/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi/libsmi-fix-the-test-dump-files.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi/libsmi-fix-the-test-dump-files.patch
rename to meta-openembedded/meta-oe/recipes-support/libsmi/libsmi/libsmi-fix-the-test-dump-files.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi/smi.conf b/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi/smi.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi/smi.conf
rename to meta-openembedded/meta-oe/recipes-support/libsmi/libsmi/smi.conf
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb b/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb
rename to meta-openembedded/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb b/meta-openembedded/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb
rename to meta-openembedded/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libssh/libssh_0.7.3.bb b/meta-openembedded/meta-oe/recipes-support/libssh/libssh_0.7.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libssh/libssh_0.7.3.bb
rename to meta-openembedded/meta-oe/recipes-support/libssh/libssh_0.7.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.8.0.bb b/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.8.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.8.0.bb
rename to meta-openembedded/meta-oe/recipes-support/libssh2/libssh2_1.8.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libtar/files/0002-Do-not-strip-libtar.patch b/meta-openembedded/meta-oe/recipes-support/libtar/files/0002-Do-not-strip-libtar.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libtar/files/0002-Do-not-strip-libtar.patch
rename to meta-openembedded/meta-oe/recipes-support/libtar/files/0002-Do-not-strip-libtar.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libtar/files/fix_libtool_sysroot.patch b/meta-openembedded/meta-oe/recipes-support/libtar/files/fix_libtool_sysroot.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libtar/files/fix_libtool_sysroot.patch
rename to meta-openembedded/meta-oe/recipes-support/libtar/files/fix_libtool_sysroot.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libtar/libtar_1.2.20.bb b/meta-openembedded/meta-oe/recipes-support/libtar/libtar_1.2.20.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libtar/libtar_1.2.20.bb
rename to meta-openembedded/meta-oe/recipes-support/libtar/libtar_1.2.20.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libteam/libteam/0001-include-sys-select.h-for-fd_set-definition.patch b/meta-openembedded/meta-oe/recipes-support/libteam/libteam/0001-include-sys-select.h-for-fd_set-definition.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libteam/libteam/0001-include-sys-select.h-for-fd_set-definition.patch
rename to meta-openembedded/meta-oe/recipes-support/libteam/libteam/0001-include-sys-select.h-for-fd_set-definition.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-disable-RedHat-specific-test.patch b/meta-openembedded/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-disable-RedHat-specific-test.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-disable-RedHat-specific-test.patch
rename to meta-openembedded/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-disable-RedHat-specific-test.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libteam/libteam/0002-teamd-Re-adjust-include-header-order.patch b/meta-openembedded/meta-oe/recipes-support/libteam/libteam/0002-teamd-Re-adjust-include-header-order.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libteam/libteam/0002-teamd-Re-adjust-include-header-order.patch
rename to meta-openembedded/meta-oe/recipes-support/libteam/libteam/0002-teamd-Re-adjust-include-header-order.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libteam/libteam/run-ptest b/meta-openembedded/meta-oe/recipes-support/libteam/libteam/run-ptest
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libteam/libteam/run-ptest
rename to meta-openembedded/meta-oe/recipes-support/libteam/libteam/run-ptest
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libteam/libteam_1.27.bb b/meta-openembedded/meta-oe/recipes-support/libteam/libteam_1.27.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libteam/libteam_1.27.bb
rename to meta-openembedded/meta-oe/recipes-support/libteam/libteam_1.27.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libtinyxml/libtinyxml/enforce-use-stl.patch b/meta-openembedded/meta-oe/recipes-support/libtinyxml/libtinyxml/enforce-use-stl.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libtinyxml/libtinyxml/enforce-use-stl.patch
rename to meta-openembedded/meta-oe/recipes-support/libtinyxml/libtinyxml/enforce-use-stl.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libtinyxml/libtinyxml/entity-encoding.patch b/meta-openembedded/meta-oe/recipes-support/libtinyxml/libtinyxml/entity-encoding.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libtinyxml/libtinyxml/entity-encoding.patch
rename to meta-openembedded/meta-oe/recipes-support/libtinyxml/libtinyxml/entity-encoding.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb b/meta-openembedded/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb
rename to meta-openembedded/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb b/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb
rename to meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libusbg/libusbg/0001-Fix-out-of-tree-builds.patch b/meta-openembedded/meta-oe/recipes-support/libusbg/libusbg/0001-Fix-out-of-tree-builds.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libusbg/libusbg/0001-Fix-out-of-tree-builds.patch
rename to meta-openembedded/meta-oe/recipes-support/libusbg/libusbg/0001-Fix-out-of-tree-builds.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libusbg/libusbg_git.bb b/meta-openembedded/meta-oe/recipes-support/libusbg/libusbg_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libusbg/libusbg_git.bb
rename to meta-openembedded/meta-oe/recipes-support/libusbg/libusbg_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libutempter/libutempter.bb b/meta-openembedded/meta-oe/recipes-support/libutempter/libutempter.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libutempter/libutempter.bb
rename to meta-openembedded/meta-oe/recipes-support/libutempter/libutempter.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libutempter/libutempter/0001-Fix-macro-error.patch b/meta-openembedded/meta-oe/recipes-support/libutempter/libutempter/0001-Fix-macro-error.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libutempter/libutempter/0001-Fix-macro-error.patch
rename to meta-openembedded/meta-oe/recipes-support/libutempter/libutempter/0001-Fix-macro-error.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/libutempter/libutempter/libutempter-remove-glibc-assumption.patch b/meta-openembedded/meta-oe/recipes-support/libutempter/libutempter/libutempter-remove-glibc-assumption.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/libutempter/libutempter/libutempter-remove-glibc-assumption.patch
rename to meta-openembedded/meta-oe/recipes-support/libutempter/libutempter/libutempter-remove-glibc-assumption.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/links/files/ac-prog-cxx.patch b/meta-openembedded/meta-oe/recipes-support/links/files/ac-prog-cxx.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/links/files/ac-prog-cxx.patch
rename to meta-openembedded/meta-oe/recipes-support/links/files/ac-prog-cxx.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/links/files/links2.desktop b/meta-openembedded/meta-oe/recipes-support/links/files/links2.desktop
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/links/files/links2.desktop
rename to meta-openembedded/meta-oe/recipes-support/links/files/links2.desktop
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/links/links-x11_2.7.bb b/meta-openembedded/meta-oe/recipes-support/links/links-x11_2.7.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/links/links-x11_2.7.bb
rename to meta-openembedded/meta-oe/recipes-support/links/links-x11_2.7.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/links/links.inc b/meta-openembedded/meta-oe/recipes-support/links/links.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/links/links.inc
rename to meta-openembedded/meta-oe/recipes-support/links/links.inc
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/links/links_2.7.bb b/meta-openembedded/meta-oe/recipes-support/links/links_2.7.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/links/links_2.7.bb
rename to meta-openembedded/meta-oe/recipes-support/links/links_2.7.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/lio-utils/lio-utils/0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch b/meta-openembedded/meta-oe/recipes-support/lio-utils/lio-utils/0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/lio-utils/lio-utils/0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch
rename to meta-openembedded/meta-oe/recipes-support/lio-utils/lio-utils/0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb b/meta-openembedded/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb
rename to meta-openembedded/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/lockdev/lockdev_git.bb b/meta-openembedded/meta-oe/recipes-support/lockdev/lockdev_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/lockdev/lockdev_git.bb
rename to meta-openembedded/meta-oe/recipes-support/lockdev/lockdev_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/log4c/log4c/0001-Use-the-API-properly-in-the-example-format-security-.patch b/meta-openembedded/meta-oe/recipes-support/log4c/log4c/0001-Use-the-API-properly-in-the-example-format-security-.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/log4c/log4c/0001-Use-the-API-properly-in-the-example-format-security-.patch
rename to meta-openembedded/meta-oe/recipes-support/log4c/log4c/0001-Use-the-API-properly-in-the-example-format-security-.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/log4c/log4c/fix_configure_with-expat.patch b/meta-openembedded/meta-oe/recipes-support/log4c/log4c/fix_configure_with-expat.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/log4c/log4c/fix_configure_with-expat.patch
rename to meta-openembedded/meta-oe/recipes-support/log4c/log4c/fix_configure_with-expat.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/log4c/log4c_1.2.4.bb b/meta-openembedded/meta-oe/recipes-support/log4c/log4c_1.2.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/log4c/log4c_1.2.4.bb
rename to meta-openembedded/meta-oe/recipes-support/log4c/log4c_1.2.4.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/log4cpp/files/fix-pc.patch b/meta-openembedded/meta-oe/recipes-support/log4cpp/files/fix-pc.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/log4cpp/files/fix-pc.patch
rename to meta-openembedded/meta-oe/recipes-support/log4cpp/files/fix-pc.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/log4cpp/log4cpp_1.1.2.bb b/meta-openembedded/meta-oe/recipes-support/log4cpp/log4cpp_1.1.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/log4cpp/log4cpp_1.1.2.bb
rename to meta-openembedded/meta-oe/recipes-support/log4cpp/log4cpp_1.1.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/logwarn/logwarn_1.0.14.bb b/meta-openembedded/meta-oe/recipes-support/logwarn/logwarn_1.0.14.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/logwarn/logwarn_1.0.14.bb
rename to meta-openembedded/meta-oe/recipes-support/logwarn/logwarn_1.0.14.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch
rename to meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch
rename to meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch
rename to meta-openembedded/meta-oe/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/lvm2/files/0003-include-fcntl.h-for-O_-defines-and-fcntl-signature.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/files/0003-include-fcntl.h-for-O_-defines-and-fcntl-signature.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/lvm2/files/0003-include-fcntl.h-for-O_-defines-and-fcntl-signature.patch
rename to meta-openembedded/meta-oe/recipes-support/lvm2/files/0003-include-fcntl.h-for-O_-defines-and-fcntl-signature.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch
rename to meta-openembedded/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch
rename to meta-openembedded/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch
rename to meta-openembedded/meta-oe/recipes-support/lvm2/files/0006-start-lvm2-monitor.service-after-tmp.mount.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/lvm2/files/lvm.conf b/meta-openembedded/meta-oe/recipes-support/lvm2/files/lvm.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/lvm2/files/lvm.conf
rename to meta-openembedded/meta-oe/recipes-support/lvm2/files/lvm.conf
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper_2.02.171.bb b/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper_2.02.171.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper_2.02.171.bb
rename to meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper_2.02.171.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc
rename to meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-explicitly-do-not-install-libdm.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-explicitly-do-not-install-libdm.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-explicitly-do-not-install-libdm.patch
rename to meta-openembedded/meta-oe/recipes-support/lvm2/lvm2/0001-explicitly-do-not-install-libdm.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.02.171.bb b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.02.171.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.02.171.bb
rename to meta-openembedded/meta-oe/recipes-support/lvm2/lvm2_2.02.171.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/mailcap/mailcap_2.1.48.bb b/meta-openembedded/meta-oe/recipes-support/mailcap/mailcap_2.1.48.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/mailcap/mailcap_2.1.48.bb
rename to meta-openembedded/meta-oe/recipes-support/mailcap/mailcap_2.1.48.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/mbuffer/mbuffer_20140310.bb b/meta-openembedded/meta-oe/recipes-support/mbuffer/mbuffer_20140310.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/mbuffer/mbuffer_20140310.bb
rename to meta-openembedded/meta-oe/recipes-support/mbuffer/mbuffer_20140310.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/mcelog/mce-inject_git.bb b/meta-openembedded/meta-oe/recipes-support/mcelog/mce-inject_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/mcelog/mce-inject_git.bb
rename to meta-openembedded/meta-oe/recipes-support/mcelog/mce-inject_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog/run-ptest b/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog/run-ptest
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog/run-ptest
rename to meta-openembedded/meta-oe/recipes-support/mcelog/mcelog/run-ptest
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_1.49.bb b/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_1.49.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_1.49.bb
rename to meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_1.49.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/mg/mg/0001-Undefine-REGEX-for-musl-based-systems.patch b/meta-openembedded/meta-oe/recipes-support/mg/mg/0001-Undefine-REGEX-for-musl-based-systems.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/mg/mg/0001-Undefine-REGEX-for-musl-based-systems.patch
rename to meta-openembedded/meta-oe/recipes-support/mg/mg/0001-Undefine-REGEX-for-musl-based-systems.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/mg/mg/0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch b/meta-openembedded/meta-oe/recipes-support/mg/mg/0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/mg/mg/0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch
rename to meta-openembedded/meta-oe/recipes-support/mg/mg/0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/mg/mg/0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch b/meta-openembedded/meta-oe/recipes-support/mg/mg/0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/mg/mg/0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch
rename to meta-openembedded/meta-oe/recipes-support/mg/mg/0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/mg/mg_20170401.bb b/meta-openembedded/meta-oe/recipes-support/mg/mg_20170401.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/mg/mg_20170401.bb
rename to meta-openembedded/meta-oe/recipes-support/mg/mg_20170401.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/mime-support/mime-support_3.48.bb b/meta-openembedded/meta-oe/recipes-support/mime-support/mime-support_3.48.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/mime-support/mime-support_3.48.bb
rename to meta-openembedded/meta-oe/recipes-support/mime-support/mime-support_3.48.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/mini-iconv/mini-iconv.bb b/meta-openembedded/meta-oe/recipes-support/mini-iconv/mini-iconv.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/mini-iconv/mini-iconv.bb
rename to meta-openembedded/meta-oe/recipes-support/mini-iconv/mini-iconv.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/minini/minini_1.2.b.bb b/meta-openembedded/meta-oe/recipes-support/minini/minini_1.2.b.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/minini/minini_1.2.b.bb
rename to meta-openembedded/meta-oe/recipes-support/minini/minini_1.2.b.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-kpartx-include-limits.h-for-PATH_MAX.patch b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-kpartx-include-limits.h-for-PATH_MAX.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-kpartx-include-limits.h-for-PATH_MAX.patch
rename to meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-kpartx-include-limits.h-for-PATH_MAX.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-multipath-attempt-at-common-multipath.rules.patch b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-multipath-attempt-at-common-multipath.rules.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-multipath-attempt-at-common-multipath.rules.patch
rename to meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0001-multipath-attempt-at-common-multipath.rules.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0002-RH-fixup-udev-rules-for-redhat.patch b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0002-RH-fixup-udev-rules-for-redhat.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0002-RH-fixup-udev-rules-for-redhat.patch
rename to meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0002-RH-fixup-udev-rules-for-redhat.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0003-RH-Remove-the-property-blacklist-exception-builtin.patch b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0003-RH-Remove-the-property-blacklist-exception-builtin.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0003-RH-Remove-the-property-blacklist-exception-builtin.patch
rename to meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0003-RH-Remove-the-property-blacklist-exception-builtin.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0004-RH-don-t-start-without-a-config-file.patch b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0004-RH-don-t-start-without-a-config-file.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0004-RH-don-t-start-without-a-config-file.patch
rename to meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0004-RH-don-t-start-without-a-config-file.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0005-RH-add-mpathconf.patch b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0005-RH-add-mpathconf.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0005-RH-add-mpathconf.patch
rename to meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0005-RH-add-mpathconf.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch
rename to meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0007-RH-trigger-change-uevent-on-new-device-creation.patch b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0007-RH-trigger-change-uevent-on-new-device-creation.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0007-RH-trigger-change-uevent-on-new-device-creation.patch
rename to meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0007-RH-trigger-change-uevent-on-new-device-creation.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0008-libmultipath-change-how-RADOS-checker-is-enabled.patch b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0008-libmultipath-change-how-RADOS-checker-is-enabled.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0008-libmultipath-change-how-RADOS-checker-is-enabled.patch
rename to meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0008-libmultipath-change-how-RADOS-checker-is-enabled.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0009-multipath-set-verbosity-to-default-during-config.patch b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0009-multipath-set-verbosity-to-default-during-config.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0009-multipath-set-verbosity-to-default-during-config.patch
rename to meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0009-multipath-set-verbosity-to-default-during-config.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0010-mpath-skip-device-configs-without-vendor-product.patch b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0010-mpath-skip-device-configs-without-vendor-product.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0010-mpath-skip-device-configs-without-vendor-product.patch
rename to meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0010-mpath-skip-device-configs-without-vendor-product.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0011-multipathd-fix-show-maps-json-crash.patch b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0011-multipathd-fix-show-maps-json-crash.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0011-multipathd-fix-show-maps-json-crash.patch
rename to meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0011-multipathd-fix-show-maps-json-crash.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0012-multipath-tools-modify-Makefile.inc-for-cross-compil.patch b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0012-multipath-tools-modify-Makefile.inc-for-cross-compil.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0012-multipath-tools-modify-Makefile.inc-for-cross-compil.patch
rename to meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0012-multipath-tools-modify-Makefile.inc-for-cross-compil.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0013-Always-use-devmapper.patch b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0013-Always-use-devmapper.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0013-Always-use-devmapper.patch
rename to meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0013-Always-use-devmapper.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0014-Always-use-devmapper-for-kpartx.patch b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0014-Always-use-devmapper-for-kpartx.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0014-Always-use-devmapper-for-kpartx.patch
rename to meta-openembedded/meta-oe/recipes-support/multipath-tools/files/0014-Always-use-devmapper-for-kpartx.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/multipath.conf.example b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/multipath.conf.example
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/multipath.conf.example
rename to meta-openembedded/meta-oe/recipes-support/multipath-tools/files/multipath.conf.example
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/multipathd.oe b/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/multipathd.oe
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/files/multipathd.oe
rename to meta-openembedded/meta-oe/recipes-support/multipath-tools/files/multipathd.oe
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.7.1.bb b/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.7.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.7.1.bb
rename to meta-openembedded/meta-oe/recipes-support/multipath-tools/multipath-tools_0.7.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/nano/nano.inc b/meta-openembedded/meta-oe/recipes-support/nano/nano.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/nano/nano.inc
rename to meta-openembedded/meta-oe/recipes-support/nano/nano.inc
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/nano/nano_2.9.3.bb b/meta-openembedded/meta-oe/recipes-support/nano/nano_2.9.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/nano/nano_2.9.3.bb
rename to meta-openembedded/meta-oe/recipes-support/nano/nano_2.9.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/ne10/ne10/0001-CMakeLists.txt-Remove-mthumb-interwork.patch b/meta-openembedded/meta-oe/recipes-support/ne10/ne10/0001-CMakeLists.txt-Remove-mthumb-interwork.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/ne10/ne10/0001-CMakeLists.txt-Remove-mthumb-interwork.patch
rename to meta-openembedded/meta-oe/recipes-support/ne10/ne10/0001-CMakeLists.txt-Remove-mthumb-interwork.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/ne10/ne10/0001-Dont-specify-march-explicitly.patch b/meta-openembedded/meta-oe/recipes-support/ne10/ne10/0001-Dont-specify-march-explicitly.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/ne10/ne10/0001-Dont-specify-march-explicitly.patch
rename to meta-openembedded/meta-oe/recipes-support/ne10/ne10/0001-Dont-specify-march-explicitly.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/ne10/ne10_1.2.1.bb b/meta-openembedded/meta-oe/recipes-support/ne10/ne10_1.2.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/ne10/ne10_1.2.1.bb
rename to meta-openembedded/meta-oe/recipes-support/ne10/ne10_1.2.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/neon/neon/pkgconfig.patch b/meta-openembedded/meta-oe/recipes-support/neon/neon/pkgconfig.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/neon/neon/pkgconfig.patch
rename to meta-openembedded/meta-oe/recipes-support/neon/neon/pkgconfig.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/neon/neon_0.30.2.bb b/meta-openembedded/meta-oe/recipes-support/neon/neon_0.30.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/neon/neon_0.30.2.bb
rename to meta-openembedded/meta-oe/recipes-support/neon/neon_0.30.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/nmon/nmon/0001-lmon16g.c-Adjust-system-headers.patch b/meta-openembedded/meta-oe/recipes-support/nmon/nmon/0001-lmon16g.c-Adjust-system-headers.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/nmon/nmon/0001-lmon16g.c-Adjust-system-headers.patch
rename to meta-openembedded/meta-oe/recipes-support/nmon/nmon/0001-lmon16g.c-Adjust-system-headers.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/nmon/nmon_16g.bb b/meta-openembedded/meta-oe/recipes-support/nmon/nmon_16g.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/nmon/nmon_16g.bb
rename to meta-openembedded/meta-oe/recipes-support/nmon/nmon_16g.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/numactl/numactl/0001-define-run-test-target.patch b/meta-openembedded/meta-oe/recipes-support/numactl/numactl/0001-define-run-test-target.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/numactl/numactl/0001-define-run-test-target.patch
rename to meta-openembedded/meta-oe/recipes-support/numactl/numactl/0001-define-run-test-target.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/numactl/numactl/Fix-the-test-output-format.patch b/meta-openembedded/meta-oe/recipes-support/numactl/numactl/Fix-the-test-output-format.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/numactl/numactl/Fix-the-test-output-format.patch
rename to meta-openembedded/meta-oe/recipes-support/numactl/numactl/Fix-the-test-output-format.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/numactl/numactl/Makefile b/meta-openembedded/meta-oe/recipes-support/numactl/numactl/Makefile
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/numactl/numactl/Makefile
rename to meta-openembedded/meta-oe/recipes-support/numactl/numactl/Makefile
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/numactl/numactl/fix-null-pointer.patch b/meta-openembedded/meta-oe/recipes-support/numactl/numactl/fix-null-pointer.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/numactl/numactl/fix-null-pointer.patch
rename to meta-openembedded/meta-oe/recipes-support/numactl/numactl/fix-null-pointer.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/numactl/numactl/run-ptest b/meta-openembedded/meta-oe/recipes-support/numactl/numactl/run-ptest
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/numactl/numactl/run-ptest
rename to meta-openembedded/meta-oe/recipes-support/numactl/numactl/run-ptest
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/numactl/numactl_git.bb b/meta-openembedded/meta-oe/recipes-support/numactl/numactl_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/numactl/numactl_git.bb
rename to meta-openembedded/meta-oe/recipes-support/numactl/numactl_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/ode/ode/install.patch b/meta-openembedded/meta-oe/recipes-support/ode/ode/install.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/ode/ode/install.patch
rename to meta-openembedded/meta-oe/recipes-support/ode/ode/install.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/onig/files/configure.patch b/meta-openembedded/meta-oe/recipes-support/onig/files/configure.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/onig/files/configure.patch
rename to meta-openembedded/meta-oe/recipes-support/onig/files/configure.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch b/meta-openembedded/meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch
rename to meta-openembedded/meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/onig/onig_5.9.6.bb b/meta-openembedded/meta-oe/recipes-support/onig/onig_5.9.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/onig/onig_5.9.6.bb
rename to meta-openembedded/meta-oe/recipes-support/onig/onig_5.9.6.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/open-vm-tools/files/tools.conf b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/files/tools.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/open-vm-tools/files/tools.conf
rename to meta-openembedded/meta-oe/recipes-support/open-vm-tools/files/tools.conf
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/open-vm-tools/files/vmtoolsd.init b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/files/vmtoolsd.init
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/open-vm-tools/files/vmtoolsd.init
rename to meta-openembedded/meta-oe/recipes-support/open-vm-tools/files/vmtoolsd.init
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/open-vm-tools/files/vmtoolsd.service b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/files/vmtoolsd.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/open-vm-tools/files/vmtoolsd.service
rename to meta-openembedded/meta-oe/recipes-support/open-vm-tools/files/vmtoolsd.service
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-Remove-assumptions-about-glibc-being-only-libc-imple.patch b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-Remove-assumptions-about-glibc-being-only-libc-imple.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-Remove-assumptions-about-glibc-being-only-libc-imple.patch
rename to meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-Remove-assumptions-about-glibc-being-only-libc-imple.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch
rename to meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-add-include-sys-sysmacros.h.patch b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-add-include-sys-sysmacros.h.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-add-include-sys-sysmacros.h.patch
rename to meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-add-include-sys-sysmacros.h.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-include-poll.h-instead-of-obsolete-sys-poll.h.patch b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-include-poll.h-instead-of-obsolete-sys-poll.h.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-include-poll.h-instead-of-obsolete-sys-poll.h.patch
rename to meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0002-include-poll.h-instead-of-obsolete-sys-poll.h.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0003-Rename-poll.h-to-vm_poll.h.patch b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0003-Rename-poll.h-to-vm_poll.h.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0003-Rename-poll.h-to-vm_poll.h.patch
rename to meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0003-Rename-poll.h-to-vm_poll.h.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0004-Add-Wno-incompatible-pointer-types-and-Wno-error-add.patch b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0004-Add-Wno-incompatible-pointer-types-and-Wno-error-add.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0004-Add-Wno-incompatible-pointer-types-and-Wno-error-add.patch
rename to meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0004-Add-Wno-incompatible-pointer-types-and-Wno-error-add.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0005-Use-configure-test-for-struct-timespec.patch b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0005-Use-configure-test-for-struct-timespec.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0005-Use-configure-test-for-struct-timespec.patch
rename to meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0005-Use-configure-test-for-struct-timespec.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0006-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0006-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0006-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch
rename to meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0006-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0007-Use-configure-to-test-for-feature-instead-of-platfor.patch b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0007-Use-configure-to-test-for-feature-instead-of-platfor.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0007-Use-configure-to-test-for-feature-instead-of-platfor.patch
rename to meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0007-Use-configure-to-test-for-feature-instead-of-platfor.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0008-use-posix-strerror_r-unless-gnu.patch b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0008-use-posix-strerror_r-unless-gnu.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0008-use-posix-strerror_r-unless-gnu.patch
rename to meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0008-use-posix-strerror_r-unless-gnu.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0009-Add-support-for-building-with-system-libtirpc.patch b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0009-Add-support-for-building-with-system-libtirpc.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0009-Add-support-for-building-with-system-libtirpc.patch
rename to meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0009-Add-support-for-building-with-system-libtirpc.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0010-gnu-ucontext.patch b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0010-gnu-ucontext.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0010-gnu-ucontext.patch
rename to meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0010-gnu-ucontext.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0011-Use-configure-test-for-sys-stat.h-include.patch b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0011-Use-configure-test-for-sys-stat.h-include.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0011-Use-configure-test-for-sys-stat.h-include.patch
rename to meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0011-Use-configure-test-for-sys-stat.h-include.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb b/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb
rename to meta-openembedded/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/openct/openct/etc-openct.udev.in-disablePROGRAM.patch b/meta-openembedded/meta-oe/recipes-support/openct/openct/etc-openct.udev.in-disablePROGRAM.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/openct/openct/etc-openct.udev.in-disablePROGRAM.patch
rename to meta-openembedded/meta-oe/recipes-support/openct/openct/etc-openct.udev.in-disablePROGRAM.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/openct/openct/etc-openct_usb.in-modify-UDEVINFO.patch b/meta-openembedded/meta-oe/recipes-support/openct/openct/etc-openct_usb.in-modify-UDEVINFO.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/openct/openct/etc-openct_usb.in-modify-UDEVINFO.patch
rename to meta-openembedded/meta-oe/recipes-support/openct/openct/etc-openct_usb.in-modify-UDEVINFO.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/openct/openct/openct.init b/meta-openembedded/meta-oe/recipes-support/openct/openct/openct.init
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/openct/openct/openct.init
rename to meta-openembedded/meta-oe/recipes-support/openct/openct/openct.init
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/openct/openct/openct.service b/meta-openembedded/meta-oe/recipes-support/openct/openct/openct.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/openct/openct/openct.service
rename to meta-openembedded/meta-oe/recipes-support/openct/openct/openct.service
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/openct/openct/openct.sysconfig b/meta-openembedded/meta-oe/recipes-support/openct/openct/openct.sysconfig
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/openct/openct/openct.sysconfig
rename to meta-openembedded/meta-oe/recipes-support/openct/openct/openct.sysconfig
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/openct/openct_0.6.20.bb b/meta-openembedded/meta-oe/recipes-support/openct/openct_0.6.20.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/openct/openct_0.6.20.bb
rename to meta-openembedded/meta-oe/recipes-support/openct/openct_0.6.20.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch
rename to meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Dont-use-isystem.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Dont-use-isystem.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Dont-use-isystem.patch
rename to meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Dont-use-isystem.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-build-workaround-GCC-7.1.1-compilation-issue-with-sa.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-build-workaround-GCC-7.1.1-compilation-issue-with-sa.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-build-workaround-GCC-7.1.1-compilation-issue-with-sa.patch
rename to meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-build-workaround-GCC-7.1.1-compilation-issue-with-sa.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-carotene-don-t-use-__asm__-with-aarch64.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-carotene-don-t-use-__asm__-with-aarch64.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-carotene-don-t-use-__asm__-with-aarch64.patch
rename to meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-carotene-don-t-use-__asm__-with-aarch64.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0002-Do-not-enable-asm-with-clang.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0002-Do-not-enable-asm-with-clang.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0002-Do-not-enable-asm-with-clang.patch
rename to meta-openembedded/meta-oe/recipes-support/opencv/opencv/0002-Do-not-enable-asm-with-clang.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0002-Make-opencv-ts-create-share-library-intead-of-static.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0002-Make-opencv-ts-create-share-library-intead-of-static.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0002-Make-opencv-ts-create-share-library-intead-of-static.patch
rename to meta-openembedded/meta-oe/recipes-support/opencv/opencv/0002-Make-opencv-ts-create-share-library-intead-of-static.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0002-imgcodecs-refactoring-improve-code-quality.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0002-imgcodecs-refactoring-improve-code-quality.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0002-imgcodecs-refactoring-improve-code-quality.patch
rename to meta-openembedded/meta-oe/recipes-support/opencv/opencv/0002-imgcodecs-refactoring-improve-code-quality.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch
rename to meta-openembedded/meta-oe/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0003-imgproc-test-add-checks-for-remove-call.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0003-imgproc-test-add-checks-for-remove-call.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0003-imgproc-test-add-checks-for-remove-call.patch
rename to meta-openembedded/meta-oe/recipes-support/opencv/opencv/0003-imgproc-test-add-checks-for-remove-call.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/opencv/opencv/CVE-2017-14136.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/CVE-2017-14136.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/opencv/opencv/CVE-2017-14136.patch
rename to meta-openembedded/meta-oe/recipes-support/opencv/opencv/CVE-2017-14136.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/opencv/opencv/already-exists.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/already-exists.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/opencv/opencv/already-exists.patch
rename to meta-openembedded/meta-oe/recipes-support/opencv/opencv/already-exists.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/opencv/opencv/fixpkgconfig.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/fixpkgconfig.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/opencv/opencv/fixpkgconfig.patch
rename to meta-openembedded/meta-oe/recipes-support/opencv/opencv/fixpkgconfig.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/opencv/opencv/javagen.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/javagen.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/opencv/opencv/javagen.patch
rename to meta-openembedded/meta-oe/recipes-support/opencv/opencv/javagen.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/opencv/opencv/protobuf.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/protobuf.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/opencv/opencv/protobuf.patch
rename to meta-openembedded/meta-oe/recipes-support/opencv/opencv/protobuf.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/opencv/opencv/tinydnn.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/tinydnn.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/opencv/opencv/tinydnn.patch
rename to meta-openembedded/meta-oe/recipes-support/opencv/opencv/tinydnn.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/opencv/opencv/uselocalxfeatures.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/uselocalxfeatures.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/opencv/opencv/uselocalxfeatures.patch
rename to meta-openembedded/meta-oe/recipes-support/opencv/opencv/uselocalxfeatures.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/opencv/opencv_3.3.bb b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_3.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/opencv/opencv_3.3.bb
rename to meta-openembedded/meta-oe/recipes-support/opencv/opencv_3.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/openldap/openldap/initscript b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/initscript
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/openldap/openldap/initscript
rename to meta-openembedded/meta-oe/recipes-support/openldap/openldap/initscript
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/openldap/openldap/install-strip.patch b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/install-strip.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/openldap/openldap/install-strip.patch
rename to meta-openembedded/meta-oe/recipes-support/openldap/openldap/install-strip.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/openldap/openldap/kill-icu.patch b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/kill-icu.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/openldap/openldap/kill-icu.patch
rename to meta-openembedded/meta-oe/recipes-support/openldap/openldap/kill-icu.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch
rename to meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-2.4.28-gnutls-gcrypt.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-CVE-2015-3276.patch b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-CVE-2015-3276.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-CVE-2015-3276.patch
rename to meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-CVE-2015-3276.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-m4-pthread.patch b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-m4-pthread.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-m4-pthread.patch
rename to meta-openembedded/meta-oe/recipes-support/openldap/openldap/openldap-m4-pthread.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/openldap/openldap/slapd.service b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/slapd.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/openldap/openldap/slapd.service
rename to meta-openembedded/meta-oe/recipes-support/openldap/openldap/slapd.service
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/openldap/openldap/thread_stub.patch b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/thread_stub.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/openldap/openldap/thread_stub.patch
rename to meta-openembedded/meta-oe/recipes-support/openldap/openldap/thread_stub.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/openldap/openldap/use-urandom.patch b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/use-urandom.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/openldap/openldap/use-urandom.patch
rename to meta-openembedded/meta-oe/recipes-support/openldap/openldap/use-urandom.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.45.bb b/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.45.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.45.bb
rename to meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.4.45.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.16.0.bb b/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.16.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.16.0.bb
rename to meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.16.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb b/meta-openembedded/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb
rename to meta-openembedded/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/openwbem/openwbem/checkserverkey b/meta-openembedded/meta-oe/recipes-support/openwbem/openwbem/checkserverkey
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/openwbem/openwbem/checkserverkey
rename to meta-openembedded/meta-oe/recipes-support/openwbem/openwbem/checkserverkey
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/openwbem/openwbem/loadmof.sh b/meta-openembedded/meta-oe/recipes-support/openwbem/openwbem/loadmof.sh
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/openwbem/openwbem/loadmof.sh
rename to meta-openembedded/meta-oe/recipes-support/openwbem/openwbem/loadmof.sh
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/openwbem/openwbem/novell-openwbem-root-acl.mof b/meta-openembedded/meta-oe/recipes-support/openwbem/openwbem/novell-openwbem-root-acl.mof
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/openwbem/openwbem/novell-openwbem-root-acl.mof
rename to meta-openembedded/meta-oe/recipes-support/openwbem/openwbem/novell-openwbem-root-acl.mof
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/openwbem/openwbem/openwbem-etc_pam.d_openwbem b/meta-openembedded/meta-oe/recipes-support/openwbem/openwbem/openwbem-etc_pam.d_openwbem
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/openwbem/openwbem/openwbem-etc_pam.d_openwbem
rename to meta-openembedded/meta-oe/recipes-support/openwbem/openwbem/openwbem-etc_pam.d_openwbem
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/openwbem/openwbem/openwbem-owcimomd.init b/meta-openembedded/meta-oe/recipes-support/openwbem/openwbem/openwbem-owcimomd.init
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/openwbem/openwbem/openwbem-owcimomd.init
rename to meta-openembedded/meta-oe/recipes-support/openwbem/openwbem/openwbem-owcimomd.init
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/openwbem/openwbem/openwbem-rpmlintrc b/meta-openembedded/meta-oe/recipes-support/openwbem/openwbem/openwbem-rpmlintrc
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/openwbem/openwbem/openwbem-rpmlintrc
rename to meta-openembedded/meta-oe/recipes-support/openwbem/openwbem/openwbem-rpmlintrc
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/openwbem/openwbem/owcimomd.service b/meta-openembedded/meta-oe/recipes-support/openwbem/openwbem/owcimomd.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/openwbem/openwbem/owcimomd.service
rename to meta-openembedded/meta-oe/recipes-support/openwbem/openwbem/owcimomd.service
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/openwbem/openwbem/rmmof.sh b/meta-openembedded/meta-oe/recipes-support/openwbem/openwbem/rmmof.sh
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/openwbem/openwbem/rmmof.sh
rename to meta-openembedded/meta-oe/recipes-support/openwbem/openwbem/rmmof.sh
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/p910nd/p910nd/fix-var-lock.patch b/meta-openembedded/meta-oe/recipes-support/p910nd/p910nd/fix-var-lock.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/p910nd/p910nd/fix-var-lock.patch
rename to meta-openembedded/meta-oe/recipes-support/p910nd/p910nd/fix-var-lock.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/p910nd/p910nd_0.95.bb b/meta-openembedded/meta-oe/recipes-support/p910nd/p910nd_0.95.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/p910nd/p910nd_0.95.bb
rename to meta-openembedded/meta-oe/recipes-support/p910nd/p910nd_0.95.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.22.bb b/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.22.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.22.bb
rename to meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.22.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/picocom/picocom_git.bb b/meta-openembedded/meta-oe/recipes-support/picocom/picocom_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/picocom/picocom_git.bb
rename to meta-openembedded/meta-oe/recipes-support/picocom/picocom_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/libotr/fix_qa-issue_include.patch b/meta-openembedded/meta-oe/recipes-support/pidgin/libotr/fix_qa-issue_include.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/libotr/fix_qa-issue_include.patch
rename to meta-openembedded/meta-oe/recipes-support/pidgin/libotr/fix_qa-issue_include.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/libotr/sepbuild.patch b/meta-openembedded/meta-oe/recipes-support/pidgin/libotr/sepbuild.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/libotr/sepbuild.patch
rename to meta-openembedded/meta-oe/recipes-support/pidgin/libotr/sepbuild.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb
rename to meta-openembedded/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb
rename to meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch
rename to meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/pidgin-cross-python-265.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch
rename to meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/sanitize-configure.ac.patch b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/sanitize-configure.ac.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/sanitize-configure.ac.patch
rename to meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/sanitize-configure.ac.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.12.0.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.12.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.12.0.bb
rename to meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.12.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/pngcheck/pngcheck/0001-make-Respect-variables-from-environement.patch b/meta-openembedded/meta-oe/recipes-support/pngcheck/pngcheck/0001-make-Respect-variables-from-environement.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/pngcheck/pngcheck/0001-make-Respect-variables-from-environement.patch
rename to meta-openembedded/meta-oe/recipes-support/pngcheck/pngcheck/0001-make-Respect-variables-from-environement.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/pngcheck/pngcheck/0001-png-fix-IDAT-windowsize-Fix-format-string-errors-in-.patch b/meta-openembedded/meta-oe/recipes-support/pngcheck/pngcheck/0001-png-fix-IDAT-windowsize-Fix-format-string-errors-in-.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/pngcheck/pngcheck/0001-png-fix-IDAT-windowsize-Fix-format-string-errors-in-.patch
rename to meta-openembedded/meta-oe/recipes-support/pngcheck/pngcheck/0001-png-fix-IDAT-windowsize-Fix-format-string-errors-in-.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/pngcheck/pngcheck/10-pngsplit-format-strings.patch b/meta-openembedded/meta-oe/recipes-support/pngcheck/pngcheck/10-pngsplit-format-strings.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/pngcheck/pngcheck/10-pngsplit-format-strings.patch
rename to meta-openembedded/meta-oe/recipes-support/pngcheck/pngcheck/10-pngsplit-format-strings.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb b/meta-openembedded/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb
rename to meta-openembedded/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/poco/poco/run-ptest b/meta-openembedded/meta-oe/recipes-support/poco/poco/run-ptest
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/poco/poco/run-ptest
rename to meta-openembedded/meta-oe/recipes-support/poco/poco/run-ptest
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/poco/poco_1.8.0.1.bb b/meta-openembedded/meta-oe/recipes-support/poco/poco_1.8.0.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/poco/poco_1.8.0.1.bb
rename to meta-openembedded/meta-oe/recipes-support/poco/poco_1.8.0.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/poppler/poppler-data_0.4.8.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler-data_0.4.8.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/poppler/poppler-data_0.4.8.bb
rename to meta-openembedded/meta-oe/recipes-support/poppler/poppler-data_0.4.8.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch b/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch
rename to meta-openembedded/meta-oe/recipes-support/poppler/poppler/0001-Do-not-overwrite-all-our-build-flags.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch b/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch
rename to meta-openembedded/meta-oe/recipes-support/poppler/poppler/0002-CairoOutputDev.cc-fix-build-error-when-using-fixedpo.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.63.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.63.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.63.0.bb
rename to meta-openembedded/meta-oe/recipes-support/poppler/poppler_0.63.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/portaudio/files/ldflags.patch b/meta-openembedded/meta-oe/recipes-support/portaudio/files/ldflags.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/portaudio/files/ldflags.patch
rename to meta-openembedded/meta-oe/recipes-support/portaudio/files/ldflags.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19_20161030.bb b/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19_20161030.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19_20161030.bb
rename to meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19_20161030.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/pps-tools/pps-tools_git.bb b/meta-openembedded/meta-oe/recipes-support/pps-tools/pps-tools_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/pps-tools/pps-tools_git.bb
rename to meta-openembedded/meta-oe/recipes-support/pps-tools/pps-tools_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/procmail/procmail/from-debian-to-fix-compile-errors.patch b/meta-openembedded/meta-oe/recipes-support/procmail/procmail/from-debian-to-fix-compile-errors.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/procmail/procmail/from-debian-to-fix-compile-errors.patch
rename to meta-openembedded/meta-oe/recipes-support/procmail/procmail/from-debian-to-fix-compile-errors.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/procmail/procmail/from-debian-to-fix-man-file.patch b/meta-openembedded/meta-oe/recipes-support/procmail/procmail/from-debian-to-fix-man-file.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/procmail/procmail/from-debian-to-fix-man-file.patch
rename to meta-openembedded/meta-oe/recipes-support/procmail/procmail/from-debian-to-fix-man-file.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/procmail/procmail/from-debian-to-modify-parameters.patch b/meta-openembedded/meta-oe/recipes-support/procmail/procmail/from-debian-to-modify-parameters.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/procmail/procmail/from-debian-to-modify-parameters.patch
rename to meta-openembedded/meta-oe/recipes-support/procmail/procmail/from-debian-to-modify-parameters.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/procmail/procmail/man-file-mailstat.1-from-debian.patch b/meta-openembedded/meta-oe/recipes-support/procmail/procmail/man-file-mailstat.1-from-debian.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/procmail/procmail/man-file-mailstat.1-from-debian.patch
rename to meta-openembedded/meta-oe/recipes-support/procmail/procmail/man-file-mailstat.1-from-debian.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/procmail/procmail_3.22.bb b/meta-openembedded/meta-oe/recipes-support/procmail/procmail_3.22.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/procmail/procmail_3.22.bb
rename to meta-openembedded/meta-oe/recipes-support/procmail/procmail_3.22.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/pv/pv_1.5.3.bb b/meta-openembedded/meta-oe/recipes-support/pv/pv_1.5.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/pv/pv_1.5.3.bb
rename to meta-openembedded/meta-oe/recipes-support/pv/pv_1.5.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/pxaregs/pxaregs-1.14/Makefile b/meta-openembedded/meta-oe/recipes-support/pxaregs/pxaregs-1.14/Makefile
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/pxaregs/pxaregs-1.14/Makefile
rename to meta-openembedded/meta-oe/recipes-support/pxaregs/pxaregs-1.14/Makefile
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/pxaregs/pxaregs-1.14/i2c.patch b/meta-openembedded/meta-oe/recipes-support/pxaregs/pxaregs-1.14/i2c.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/pxaregs/pxaregs-1.14/i2c.patch
rename to meta-openembedded/meta-oe/recipes-support/pxaregs/pxaregs-1.14/i2c.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/pxaregs/pxaregs-1.14/munmap.patch b/meta-openembedded/meta-oe/recipes-support/pxaregs/pxaregs-1.14/munmap.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/pxaregs/pxaregs-1.14/munmap.patch
rename to meta-openembedded/meta-oe/recipes-support/pxaregs/pxaregs-1.14/munmap.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/pxaregs/pxaregs-1.14/pxaregs.c b/meta-openembedded/meta-oe/recipes-support/pxaregs/pxaregs-1.14/pxaregs.c
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/pxaregs/pxaregs-1.14/pxaregs.c
rename to meta-openembedded/meta-oe/recipes-support/pxaregs/pxaregs-1.14/pxaregs.c
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/pxaregs/pxaregs-1.14/serial.patch b/meta-openembedded/meta-oe/recipes-support/pxaregs/pxaregs-1.14/serial.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/pxaregs/pxaregs-1.14/serial.patch
rename to meta-openembedded/meta-oe/recipes-support/pxaregs/pxaregs-1.14/serial.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/pxaregs/pxaregs-1.14/usb.patch b/meta-openembedded/meta-oe/recipes-support/pxaregs/pxaregs-1.14/usb.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/pxaregs/pxaregs-1.14/usb.patch
rename to meta-openembedded/meta-oe/recipes-support/pxaregs/pxaregs-1.14/usb.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb b/meta-openembedded/meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb
rename to meta-openembedded/meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch b/meta-openembedded/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch
rename to meta-openembedded/meta-oe/recipes-support/raptor2/files/0001-configure.ac-do-additional-checks-on-libxml2-also-wh.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/raptor2/raptor2_2.0.15.bb b/meta-openembedded/meta-oe/recipes-support/raptor2/raptor2_2.0.15.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/raptor2/raptor2_2.0.15.bb
rename to meta-openembedded/meta-oe/recipes-support/raptor2/raptor2_2.0.15.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/rdfind/files/reproducible_build.patch b/meta-openembedded/meta-oe/recipes-support/rdfind/files/reproducible_build.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/rdfind/files/reproducible_build.patch
rename to meta-openembedded/meta-oe/recipes-support/rdfind/files/reproducible_build.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/rdfind/rdfind_1.3.4.bb b/meta-openembedded/meta-oe/recipes-support/rdfind/rdfind_1.3.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/rdfind/rdfind_1.3.4.bb
rename to meta-openembedded/meta-oe/recipes-support/rdfind/rdfind_1.3.4.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/read-edid/read-edid/0001-configure-remove-check-for-x86.h-we-don-t-build-get-.patch b/meta-openembedded/meta-oe/recipes-support/read-edid/read-edid/0001-configure-remove-check-for-x86.h-we-don-t-build-get-.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/read-edid/read-edid/0001-configure-remove-check-for-x86.h-we-don-t-build-get-.patch
rename to meta-openembedded/meta-oe/recipes-support/read-edid/read-edid/0001-configure-remove-check-for-x86.h-we-don-t-build-get-.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/read-edid/read-edid_2.0.0.bb b/meta-openembedded/meta-oe/recipes-support/read-edid/read-edid_2.0.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/read-edid/read-edid_2.0.0.bb
rename to meta-openembedded/meta-oe/recipes-support/read-edid/read-edid_2.0.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot/configure-fix-cmd_rsync.patch b/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot/configure-fix-cmd_rsync.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot/configure-fix-cmd_rsync.patch
rename to meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot/configure-fix-cmd_rsync.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb b/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb
rename to meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb b/meta-openembedded/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb
rename to meta-openembedded/meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb b/meta-openembedded/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb
rename to meta-openembedded/meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb b/meta-openembedded/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb
rename to meta-openembedded/meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/satyr/files/0001-do-not-support-python2.patch b/meta-openembedded/meta-oe/recipes-support/satyr/files/0001-do-not-support-python2.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/satyr/files/0001-do-not-support-python2.patch
rename to meta-openembedded/meta-oe/recipes-support/satyr/files/0001-do-not-support-python2.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/satyr/files/0002-fix-compile-failure-against-musl-C-library.patch b/meta-openembedded/meta-oe/recipes-support/satyr/files/0002-fix-compile-failure-against-musl-C-library.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/satyr/files/0002-fix-compile-failure-against-musl-C-library.patch
rename to meta-openembedded/meta-oe/recipes-support/satyr/files/0002-fix-compile-failure-against-musl-C-library.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.23.bb b/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.23.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.23.bb
rename to meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.23.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch b/meta-openembedded/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch
rename to meta-openembedded/meta-oe/recipes-support/sdparm/files/make-sysroot-work.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/sdparm/sdparm_1.10.bb b/meta-openembedded/meta-oe/recipes-support/sdparm/sdparm_1.10.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/sdparm/sdparm_1.10.bb
rename to meta-openembedded/meta-oe/recipes-support/sdparm/sdparm_1.10.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/serial-utils/pty-forward-native.bb b/meta-openembedded/meta-oe/recipes-support/serial-utils/pty-forward-native.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/serial-utils/pty-forward-native.bb
rename to meta-openembedded/meta-oe/recipes-support/serial-utils/pty-forward-native.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/serial-utils/serial-forward/0001-serial_forward-Disable-default-static-linking.patch b/meta-openembedded/meta-oe/recipes-support/serial-utils/serial-forward/0001-serial_forward-Disable-default-static-linking.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/serial-utils/serial-forward/0001-serial_forward-Disable-default-static-linking.patch
rename to meta-openembedded/meta-oe/recipes-support/serial-utils/serial-forward/0001-serial_forward-Disable-default-static-linking.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/serial-utils/serial-forward_git.bb b/meta-openembedded/meta-oe/recipes-support/serial-utils/serial-forward_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/serial-utils/serial-forward_git.bb
rename to meta-openembedded/meta-oe/recipes-support/serial-utils/serial-forward_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/sg3-utils/sg3-utils_1.42.bb b/meta-openembedded/meta-oe/recipes-support/sg3-utils/sg3-utils_1.42.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/sg3-utils/sg3-utils_1.42.bb
rename to meta-openembedded/meta-oe/recipes-support/sg3-utils/sg3-utils_1.42.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-build-with-clang.patch b/meta-openembedded/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-build-with-clang.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-build-with-clang.patch
rename to meta-openembedded/meta-oe/recipes-support/sharutils/sharutils/0001-Fix-build-with-clang.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb b/meta-openembedded/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb
rename to meta-openembedded/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/smem/smem_1.4.bb b/meta-openembedded/meta-oe/recipes-support/smem/smem_1.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/smem/smem_1.4.bb
rename to meta-openembedded/meta-oe/recipes-support/smem/smem_1.4.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb b/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb
rename to meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/srecord/files/add-option-to-remove-docs.patch b/meta-openembedded/meta-oe/recipes-support/srecord/files/add-option-to-remove-docs.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/srecord/files/add-option-to-remove-docs.patch
rename to meta-openembedded/meta-oe/recipes-support/srecord/files/add-option-to-remove-docs.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/srecord/srecord_1.64.bb b/meta-openembedded/meta-oe/recipes-support/srecord/srecord_1.64.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/srecord/srecord_1.64.bb
rename to meta-openembedded/meta-oe/recipes-support/srecord/srecord_1.64.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0001-Use-pragma-once-unconditionally.patch b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0001-Use-pragma-once-unconditionally.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0001-Use-pragma-once-unconditionally.patch
rename to meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0001-Use-pragma-once-unconditionally.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0001-ssieventmonitor-ordered-comparison-between-pointers-.patch b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0001-ssieventmonitor-ordered-comparison-between-pointers-.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0001-ssieventmonitor-ordered-comparison-between-pointers-.patch
rename to meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0001-ssieventmonitor-ordered-comparison-between-pointers-.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0002-Convert-macros-into-functions.patch b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0002-Convert-macros-into-functions.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0002-Convert-macros-into-functions.patch
rename to meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0002-Convert-macros-into-functions.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0003-Replace-canonicalize_file_name-with-realpath-API.patch b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0003-Replace-canonicalize_file_name-with-realpath-API.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0003-Replace-canonicalize_file_name-with-realpath-API.patch
rename to meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0003-Replace-canonicalize_file_name-with-realpath-API.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0004-engine-Fix-indentation-and-missing-semi-colon.patch b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0004-engine-Fix-indentation-and-missing-semi-colon.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0004-engine-Fix-indentation-and-missing-semi-colon.patch
rename to meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0004-engine-Fix-indentation-and-missing-semi-colon.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0005-engine-Define-SENTINEL.patch b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0005-engine-Define-SENTINEL.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0005-engine-Define-SENTINEL.patch
rename to meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0005-engine-Define-SENTINEL.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0006-tools-Add-missing-includes-and-use-realpath-instead-.patch b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0006-tools-Add-missing-includes-and-use-realpath-instead-.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0006-tools-Add-missing-includes-and-use-realpath-instead-.patch
rename to meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/0006-tools-Add-missing-includes-and-use-realpath-instead-.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/configure-cflags.patch b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/configure-cflags.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/configure-cflags.patch
rename to meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi/configure-cflags.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi_1.0.1.bb b/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi_1.0.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi_1.0.1.bb
rename to meta-openembedded/meta-oe/recipes-support/ssiapi/ssiapi_1.0.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0001-dpkg-start-stop-daemon-Accept-SIG-prefixed-signal-na.patch b/meta-openembedded/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0001-dpkg-start-stop-daemon-Accept-SIG-prefixed-signal-na.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0001-dpkg-start-stop-daemon-Accept-SIG-prefixed-signal-na.patch
rename to meta-openembedded/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0001-dpkg-start-stop-daemon-Accept-SIG-prefixed-signal-na.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.17.25.bb b/meta-openembedded/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.17.25.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.17.25.bb
rename to meta-openembedded/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.17.25.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/synergy/synergy_git.bb b/meta-openembedded/meta-oe/recipes-support/synergy/synergy_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/synergy/synergy_git.bb
rename to meta-openembedded/meta-oe/recipes-support/synergy/synergy_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/Fix-the-memory-leak-problem-when-HAVE_ENVIRON-defined.patch b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/Fix-the-memory-leak-problem-when-HAVE_ENVIRON-defined.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/Fix-the-memory-leak-problem-when-HAVE_ENVIRON-defined.patch
rename to meta-openembedded/meta-oe/recipes-support/syslog-ng/files/Fix-the-memory-leak-problem-when-HAVE_ENVIRON-defined.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/configure.ac-add-option-enable-thread-tls-to-manage-.patch b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/configure.ac-add-option-enable-thread-tls-to-manage-.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/configure.ac-add-option-enable-thread-tls-to-manage-.patch
rename to meta-openembedded/meta-oe/recipes-support/syslog-ng/files/configure.ac-add-option-enable-thread-tls-to-manage-.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch
rename to meta-openembedded/meta-oe/recipes-support/syslog-ng/files/fix-config-libnet.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/fix-invalid-ownership.patch b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/fix-invalid-ownership.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/fix-invalid-ownership.patch
rename to meta-openembedded/meta-oe/recipes-support/syslog-ng/files/fix-invalid-ownership.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/initscript b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/initscript
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/initscript
rename to meta-openembedded/meta-oe/recipes-support/syslog-ng/files/initscript
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf
rename to meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch
rename to meta-openembedded/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/volatiles.03_syslog-ng b/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/volatiles.03_syslog-ng
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/volatiles.03_syslog-ng
rename to meta-openembedded/meta-oe/recipes-support/syslog-ng/files/volatiles.03_syslog-ng
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
rename to meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.8.1.bb b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.8.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.8.1.bb
rename to meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_3.8.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/system-config-keyboard/system-config-keyboard_1.4.0.bb b/meta-openembedded/meta-oe/recipes-support/system-config-keyboard/system-config-keyboard_1.4.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/system-config-keyboard/system-config-keyboard_1.4.0.bb
rename to meta-openembedded/meta-oe/recipes-support/system-config-keyboard/system-config-keyboard_1.4.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/tbb/tbb.bb b/meta-openembedded/meta-oe/recipes-support/tbb/tbb.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/tbb/tbb.bb
rename to meta-openembedded/meta-oe/recipes-support/tbb/tbb.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch b/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch
rename to meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-mallinfo-is-glibc-specific-API-mark-it-so.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/tbb/tbb/cross-compile.patch b/meta-openembedded/meta-oe/recipes-support/tbb/tbb/cross-compile.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/tbb/tbb/cross-compile.patch
rename to meta-openembedded/meta-oe/recipes-support/tbb/tbb/cross-compile.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/tbb/tbb/tbb.pc b/meta-openembedded/meta-oe/recipes-support/tbb/tbb/tbb.pc
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/tbb/tbb/tbb.pc
rename to meta-openembedded/meta-oe/recipes-support/tbb/tbb/tbb.pc
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/files/0001-do-not-strip-pdata_tools-at-do_install.patch b/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/files/0001-do-not-strip-pdata_tools-at-do_install.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/files/0001-do-not-strip-pdata_tools-at-do_install.patch
rename to meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/files/0001-do-not-strip-pdata_tools-at-do_install.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.6.3.bb b/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.6.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.6.3.bb
rename to meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_0.6.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/tokyocabinet/tokyocabinet/remove-hard-coded-include-and-lib-paths.patch b/meta-openembedded/meta-oe/recipes-support/tokyocabinet/tokyocabinet/remove-hard-coded-include-and-lib-paths.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/tokyocabinet/tokyocabinet/remove-hard-coded-include-and-lib-paths.patch
rename to meta-openembedded/meta-oe/recipes-support/tokyocabinet/tokyocabinet/remove-hard-coded-include-and-lib-paths.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/tokyocabinet/tokyocabinet_1.4.48.bb b/meta-openembedded/meta-oe/recipes-support/tokyocabinet/tokyocabinet_1.4.48.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/tokyocabinet/tokyocabinet_1.4.48.bb
rename to meta-openembedded/meta-oe/recipes-support/tokyocabinet/tokyocabinet_1.4.48.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/toscoterm/toscoterm_git.bb b/meta-openembedded/meta-oe/recipes-support/toscoterm/toscoterm_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/toscoterm/toscoterm_git.bb
rename to meta-openembedded/meta-oe/recipes-support/toscoterm/toscoterm_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/tree/tree_1.7.0.bb b/meta-openembedded/meta-oe/recipes-support/tree/tree_1.7.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/tree/tree_1.7.0.bb
rename to meta-openembedded/meta-oe/recipes-support/tree/tree_1.7.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/udisks/udisks/0001-Make-udev-rules-directory-configurable.patch b/meta-openembedded/meta-oe/recipes-support/udisks/udisks/0001-Make-udev-rules-directory-configurable.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/udisks/udisks/0001-Make-udev-rules-directory-configurable.patch
rename to meta-openembedded/meta-oe/recipes-support/udisks/udisks/0001-Make-udev-rules-directory-configurable.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/udisks/udisks/0001-fix-build-with-newer-glibc-versions.patch b/meta-openembedded/meta-oe/recipes-support/udisks/udisks/0001-fix-build-with-newer-glibc-versions.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/udisks/udisks/0001-fix-build-with-newer-glibc-versions.patch
rename to meta-openembedded/meta-oe/recipes-support/udisks/udisks/0001-fix-build-with-newer-glibc-versions.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/udisks/udisks/optional-depends.patch b/meta-openembedded/meta-oe/recipes-support/udisks/udisks/optional-depends.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/udisks/udisks/optional-depends.patch
rename to meta-openembedded/meta-oe/recipes-support/udisks/udisks/optional-depends.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/udisks/udisks/udisks-1.0.5-fix-service-file.patch b/meta-openembedded/meta-oe/recipes-support/udisks/udisks/udisks-1.0.5-fix-service-file.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/udisks/udisks/udisks-1.0.5-fix-service-file.patch
rename to meta-openembedded/meta-oe/recipes-support/udisks/udisks/udisks-1.0.5-fix-service-file.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/udisks/udisks2/0001-data-fix-out-of-tree-build.patch b/meta-openembedded/meta-oe/recipes-support/udisks/udisks2/0001-data-fix-out-of-tree-build.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/udisks/udisks2/0001-data-fix-out-of-tree-build.patch
rename to meta-openembedded/meta-oe/recipes-support/udisks/udisks2/0001-data-fix-out-of-tree-build.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/udisks/udisks2/non-gnu-libc.patch b/meta-openembedded/meta-oe/recipes-support/udisks/udisks2/non-gnu-libc.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/udisks/udisks2/non-gnu-libc.patch
rename to meta-openembedded/meta-oe/recipes-support/udisks/udisks2/non-gnu-libc.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_2.7.6.bb b/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_2.7.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_2.7.6.bb
rename to meta-openembedded/meta-oe/recipes-support/udisks/udisks2_2.7.6.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/udisks/udisks_1.0.5.bb b/meta-openembedded/meta-oe/recipes-support/udisks/udisks_1.0.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/udisks/udisks_1.0.5.bb
rename to meta-openembedded/meta-oe/recipes-support/udisks/udisks_1.0.5.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/uim/uim/0001-Add-support-for-aarch64.patch b/meta-openembedded/meta-oe/recipes-support/uim/uim/0001-Add-support-for-aarch64.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/uim/uim/0001-Add-support-for-aarch64.patch
rename to meta-openembedded/meta-oe/recipes-support/uim/uim/0001-Add-support-for-aarch64.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/uim/uim/0001-fix-bug-for-cross-compile.patch b/meta-openembedded/meta-oe/recipes-support/uim/uim/0001-fix-bug-for-cross-compile.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/uim/uim/0001-fix-bug-for-cross-compile.patch
rename to meta-openembedded/meta-oe/recipes-support/uim/uim/0001-fix-bug-for-cross-compile.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/uim/uim/uim-module-manager.patch b/meta-openembedded/meta-oe/recipes-support/uim/uim/uim-module-manager.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/uim/uim/uim-module-manager.patch
rename to meta-openembedded/meta-oe/recipes-support/uim/uim/uim-module-manager.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/uim/uim_1.8.6.bb b/meta-openembedded/meta-oe/recipes-support/uim/uim_1.8.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/uim/uim_1.8.6.bb
rename to meta-openembedded/meta-oe/recipes-support/uim/uim_1.8.6.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/unixodbc/files/do-not-use-libltdl-source-directory.patch b/meta-openembedded/meta-oe/recipes-support/unixodbc/files/do-not-use-libltdl-source-directory.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/unixodbc/files/do-not-use-libltdl-source-directory.patch
rename to meta-openembedded/meta-oe/recipes-support/unixodbc/files/do-not-use-libltdl-source-directory.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/unixodbc/unixodbc_2.3.6.bb b/meta-openembedded/meta-oe/recipes-support/unixodbc/unixodbc_2.3.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/unixodbc/unixodbc_2.3.6.bb
rename to meta-openembedded/meta-oe/recipes-support/unixodbc/unixodbc_2.3.6.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.7.bb b/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.7.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.7.bb
rename to meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.7.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/uriparser/uriparser_0.8.4.bb b/meta-openembedded/meta-oe/recipes-support/uriparser/uriparser_0.8.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/uriparser/uriparser_0.8.4.bb
rename to meta-openembedded/meta-oe/recipes-support/uriparser/uriparser_0.8.4.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20170205.bb b/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20170205.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20170205.bb
rename to meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20170205.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.5.0.bb b/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.5.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.5.0.bb
rename to meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.5.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/usbpath/usbpath/configure.patch b/meta-openembedded/meta-oe/recipes-support/usbpath/usbpath/configure.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/usbpath/usbpath/configure.patch
rename to meta-openembedded/meta-oe/recipes-support/usbpath/usbpath/configure.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/usbpath/usbpath_svn.bb b/meta-openembedded/meta-oe/recipes-support/usbpath/usbpath_svn.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/usbpath/usbpath_svn.bb
rename to meta-openembedded/meta-oe/recipes-support/usbpath/usbpath_svn.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/uthash/uthash/run-ptest b/meta-openembedded/meta-oe/recipes-support/uthash/uthash/run-ptest
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/uthash/uthash/run-ptest
rename to meta-openembedded/meta-oe/recipes-support/uthash/uthash/run-ptest
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/uthash/uthash_2.0.2.bb b/meta-openembedded/meta-oe/recipes-support/uthash/uthash_2.0.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/uthash/uthash_2.0.2.bb
rename to meta-openembedded/meta-oe/recipes-support/uthash/uthash_2.0.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/utouch/files/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch b/meta-openembedded/meta-oe/recipes-support/utouch/files/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/utouch/files/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch
rename to meta-openembedded/meta-oe/recipes-support/utouch/files/0001-include-sys-stat.h-for-fixing-build-issue-on-musl.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/utouch/files/remove-man-page-creation.patch b/meta-openembedded/meta-oe/recipes-support/utouch/files/remove-man-page-creation.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/utouch/files/remove-man-page-creation.patch
rename to meta-openembedded/meta-oe/recipes-support/utouch/files/remove-man-page-creation.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/utouch/utouch-evemu_git.bb b/meta-openembedded/meta-oe/recipes-support/utouch/utouch-evemu_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/utouch/utouch-evemu_git.bb
rename to meta-openembedded/meta-oe/recipes-support/utouch/utouch-evemu_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/utouch/utouch-frame_git.bb b/meta-openembedded/meta-oe/recipes-support/utouch/utouch-frame_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/utouch/utouch-frame_git.bb
rename to meta-openembedded/meta-oe/recipes-support/utouch/utouch-frame_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/utouch/utouch-mtview_git.bb b/meta-openembedded/meta-oe/recipes-support/utouch/utouch-mtview_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/utouch/utouch-mtview_git.bb
rename to meta-openembedded/meta-oe/recipes-support/utouch/utouch-mtview_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/Makefile.utils b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/Makefile.utils
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/Makefile.utils
rename to meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/Makefile.utils
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.8.bb b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.8.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.8.bb
rename to meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.8.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/vim/files/CVE-2017-17087.patch b/meta-openembedded/meta-oe/recipes-support/vim/files/CVE-2017-17087.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/vim/files/CVE-2017-17087.patch
rename to meta-openembedded/meta-oe/recipes-support/vim/files/CVE-2017-17087.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/vim/files/disable_acl_header_check.patch b/meta-openembedded/meta-oe/recipes-support/vim/files/disable_acl_header_check.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/vim/files/disable_acl_header_check.patch
rename to meta-openembedded/meta-oe/recipes-support/vim/files/disable_acl_header_check.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch b/meta-openembedded/meta-oe/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch
rename to meta-openembedded/meta-oe/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/vim/vim-tiny_8.0.0983.bb b/meta-openembedded/meta-oe/recipes-support/vim/vim-tiny_8.0.0983.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/vim/vim-tiny_8.0.0983.bb
rename to meta-openembedded/meta-oe/recipes-support/vim/vim-tiny_8.0.0983.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/vim/vim_8.0.0983.bb b/meta-openembedded/meta-oe/recipes-support/vim/vim_8.0.0983.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/vim/vim_8.0.0983.bb
rename to meta-openembedded/meta-oe/recipes-support/vim/vim_8.0.0983.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.7.0/0001-Fix-issue-599.patch b/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.7.0/0001-Fix-issue-599.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.7.0/0001-Fix-issue-599.patch
rename to meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.7.0/0001-Fix-issue-599.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.7.0/4cab5e5c0c5f19fcee7d37b4a38b156d63a150d4.patch b/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.7.0/4cab5e5c0c5f19fcee7d37b4a38b156d63a150d4.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.7.0/4cab5e5c0c5f19fcee7d37b4a38b156d63a150d4.patch
rename to meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.7.0/4cab5e5c0c5f19fcee7d37b4a38b156d63a150d4.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.7.0/9ddb300d874a30db35e3ad58f188944bef0bf31b.patch b/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.7.0/9ddb300d874a30db35e3ad58f188944bef0bf31b.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.7.0/9ddb300d874a30db35e3ad58f188944bef0bf31b.patch
rename to meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.7.0/9ddb300d874a30db35e3ad58f188944bef0bf31b.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.7.0/disable-tests.patch b/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.7.0/disable-tests.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.7.0/disable-tests.patch
rename to meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp-0.7.0/disable-tests.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp_0.7.0.bb b/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp_0.7.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp_0.7.0.bb
rename to meta-openembedded/meta-oe/recipes-support/websocketpp/websocketpp_0.7.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/wmiconfig/wmiconfig/0001-makefile-Pass-CFLAGS-to-compile.patch b/meta-openembedded/meta-oe/recipes-support/wmiconfig/wmiconfig/0001-makefile-Pass-CFLAGS-to-compile.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/wmiconfig/wmiconfig/0001-makefile-Pass-CFLAGS-to-compile.patch
rename to meta-openembedded/meta-oe/recipes-support/wmiconfig/wmiconfig/0001-makefile-Pass-CFLAGS-to-compile.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/wmiconfig/wmiconfig/0002-fix-err-API-to-have-format-string.patch b/meta-openembedded/meta-oe/recipes-support/wmiconfig/wmiconfig/0002-fix-err-API-to-have-format-string.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/wmiconfig/wmiconfig/0002-fix-err-API-to-have-format-string.patch
rename to meta-openembedded/meta-oe/recipes-support/wmiconfig/wmiconfig/0002-fix-err-API-to-have-format-string.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/wmiconfig/wmiconfig_svn.bb b/meta-openembedded/meta-oe/recipes-support/wmiconfig/wmiconfig_svn.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/wmiconfig/wmiconfig_svn.bb
rename to meta-openembedded/meta-oe/recipes-support/wmiconfig/wmiconfig_svn.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/xdelta/xdelta3_3.0.11.bb b/meta-openembedded/meta-oe/recipes-support/xdelta/xdelta3_3.0.11.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/xdelta/xdelta3_3.0.11.bb
rename to meta-openembedded/meta-oe/recipes-support/xdelta/xdelta3_3.0.11.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.17.bb b/meta-openembedded/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.17.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.17.bb
rename to meta-openembedded/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.17.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/xmlstarlet/files/0001-usage2c.awk-fix-wrong-basename-regexp.patch b/meta-openembedded/meta-oe/recipes-support/xmlstarlet/files/0001-usage2c.awk-fix-wrong-basename-regexp.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/xmlstarlet/files/0001-usage2c.awk-fix-wrong-basename-regexp.patch
rename to meta-openembedded/meta-oe/recipes-support/xmlstarlet/files/0001-usage2c.awk-fix-wrong-basename-regexp.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/xmlstarlet/files/configure.ac.patch b/meta-openembedded/meta-oe/recipes-support/xmlstarlet/files/configure.ac.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/xmlstarlet/files/configure.ac.patch
rename to meta-openembedded/meta-oe/recipes-support/xmlstarlet/files/configure.ac.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb b/meta-openembedded/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb
rename to meta-openembedded/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb b/meta-openembedded/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb
rename to meta-openembedded/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch
rename to meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-of-CVE-2017-16927.patch b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-of-CVE-2017-16927.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-of-CVE-2017-16927.patch
rename to meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-of-CVE-2017-16927.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-sesman.ini-and-xrdp.ini.patch b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-sesman.ini-and-xrdp.ini.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-sesman.ini-and-xrdp.ini.patch
rename to meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-sesman.ini-and-xrdp.ini.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-the-compile-error.patch b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-the-compile-error.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-the-compile-error.patch
rename to meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-the-compile-error.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/xrdp.sysconfig b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/xrdp.sysconfig
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/xrdp.sysconfig
rename to meta-openembedded/meta-oe/recipes-support/xrdp/xrdp/xrdp.sysconfig
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.4.bb b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.4.bb
rename to meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.4.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/zbar/zbar/0001-make-relies-GNU-extentions.patch b/meta-openembedded/meta-oe/recipes-support/zbar/zbar/0001-make-relies-GNU-extentions.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/zbar/zbar/0001-make-relies-GNU-extentions.patch
rename to meta-openembedded/meta-oe/recipes-support/zbar/zbar/0001-make-relies-GNU-extentions.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/zbar/zbar/0001-undefine-__va_arg_pack.patch b/meta-openembedded/meta-oe/recipes-support/zbar/zbar/0001-undefine-__va_arg_pack.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/zbar/zbar/0001-undefine-__va_arg_pack.patch
rename to meta-openembedded/meta-oe/recipes-support/zbar/zbar/0001-undefine-__va_arg_pack.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/zbar/zbar_0.10.bb b/meta-openembedded/meta-oe/recipes-support/zbar/zbar_0.10.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/zbar/zbar_0.10.bb
rename to meta-openembedded/meta-oe/recipes-support/zbar/zbar_0.10.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/zile/files/remove-help2man.patch b/meta-openembedded/meta-oe/recipes-support/zile/files/remove-help2man.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/zile/files/remove-help2man.patch
rename to meta-openembedded/meta-oe/recipes-support/zile/files/remove-help2man.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/zile/zile_2.4.14.bb b/meta-openembedded/meta-oe/recipes-support/zile/zile_2.4.14.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-support/zile/zile_2.4.14.bb
rename to meta-openembedded/meta-oe/recipes-support/zile/zile_2.4.14.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-test/cppunit/cppunit_1.13.2.bb b/meta-openembedded/meta-oe/recipes-test/cppunit/cppunit_1.13.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-test/cppunit/cppunit_1.13.2.bb
rename to meta-openembedded/meta-oe/recipes-test/cppunit/cppunit_1.13.2.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-test/cppunit/files/0001-doc-Makefile.am-do-not-preserve-file-flags-when-copy.patch b/meta-openembedded/meta-oe/recipes-test/cppunit/files/0001-doc-Makefile.am-do-not-preserve-file-flags-when-copy.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-test/cppunit/files/0001-doc-Makefile.am-do-not-preserve-file-flags-when-copy.patch
rename to meta-openembedded/meta-oe/recipes-test/cppunit/files/0001-doc-Makefile.am-do-not-preserve-file-flags-when-copy.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-test/cunit/cunit_2.1-3.bb b/meta-openembedded/meta-oe/recipes-test/cunit/cunit_2.1-3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-test/cunit/cunit_2.1-3.bb
rename to meta-openembedded/meta-oe/recipes-test/cunit/cunit_2.1-3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-test/cunit/files/fixup-install-docdir.patch b/meta-openembedded/meta-oe/recipes-test/cunit/files/fixup-install-docdir.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-test/cunit/files/fixup-install-docdir.patch
rename to meta-openembedded/meta-oe/recipes-test/cunit/files/fixup-install-docdir.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-test/cxxtest/cxxtest_4.3.bb b/meta-openembedded/meta-oe/recipes-test/cxxtest/cxxtest_4.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-test/cxxtest/cxxtest_4.3.bb
rename to meta-openembedded/meta-oe/recipes-test/cxxtest/cxxtest_4.3.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-test/evtest/evtest_git.bb b/meta-openembedded/meta-oe/recipes-test/evtest/evtest_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-test/evtest/evtest_git.bb
rename to meta-openembedded/meta-oe/recipes-test/evtest/evtest_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-test/fbtest/fb-test_git.bb b/meta-openembedded/meta-oe/recipes-test/fbtest/fb-test_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-test/fbtest/fb-test_git.bb
rename to meta-openembedded/meta-oe/recipes-test/fbtest/fb-test_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0001-Add-correct-printf-qualifier-for-off_t.patch b/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0001-Add-correct-printf-qualifier-for-off_t.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0001-Add-correct-printf-qualifier-for-off_t.patch
rename to meta-openembedded/meta-oe/recipes-test/fwts/fwts/0001-Add-correct-printf-qualifier-for-off_t.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0001-Include-poll.h-instead-of-deprecated-sys-poll.h.patch b/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0001-Include-poll.h-instead-of-deprecated-sys-poll.h.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0001-Include-poll.h-instead-of-deprecated-sys-poll.h.patch
rename to meta-openembedded/meta-oe/recipes-test/fwts/fwts/0001-Include-poll.h-instead-of-deprecated-sys-poll.h.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0001-ignore-constant-logical-operand-warning-with-clang.patch b/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0001-ignore-constant-logical-operand-warning-with-clang.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0001-ignore-constant-logical-operand-warning-with-clang.patch
rename to meta-openembedded/meta-oe/recipes-test/fwts/fwts/0001-ignore-constant-logical-operand-warning-with-clang.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0002-Add-C99-defined-format-for-printing-uint64_t.patch b/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0002-Add-C99-defined-format-for-printing-uint64_t.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0002-Add-C99-defined-format-for-printing-uint64_t.patch
rename to meta-openembedded/meta-oe/recipes-test/fwts/fwts/0002-Add-C99-defined-format-for-printing-uint64_t.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0002-Define-__SWORD_TYPE-if-not-defined-by-libc.patch b/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0002-Define-__SWORD_TYPE-if-not-defined-by-libc.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0002-Define-__SWORD_TYPE-if-not-defined-by-libc.patch
rename to meta-openembedded/meta-oe/recipes-test/fwts/fwts/0002-Define-__SWORD_TYPE-if-not-defined-by-libc.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0003-Undefine-PAGE_SIZE.patch b/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0003-Undefine-PAGE_SIZE.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0003-Undefine-PAGE_SIZE.patch
rename to meta-openembedded/meta-oe/recipes-test/fwts/fwts/0003-Undefine-PAGE_SIZE.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0003-use-intptr_t-to-fix-pointer-to-int-cast-issues.patch b/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0003-use-intptr_t-to-fix-pointer-to-int-cast-issues.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0003-use-intptr_t-to-fix-pointer-to-int-cast-issues.patch
rename to meta-openembedded/meta-oe/recipes-test/fwts/fwts/0003-use-intptr_t-to-fix-pointer-to-int-cast-issues.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-test/fwts/fwts_git.bb b/meta-openembedded/meta-oe/recipes-test/fwts/fwts_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-test/fwts/fwts_git.bb
rename to meta-openembedded/meta-oe/recipes-test/fwts/fwts_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-test/gtest/gtest/Add-pkg-config-support.patch b/meta-openembedded/meta-oe/recipes-test/gtest/gtest/Add-pkg-config-support.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-test/gtest/gtest/Add-pkg-config-support.patch
rename to meta-openembedded/meta-oe/recipes-test/gtest/gtest/Add-pkg-config-support.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-test/gtest/gtest_1.8.0.bb b/meta-openembedded/meta-oe/recipes-test/gtest/gtest_1.8.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-test/gtest/gtest_1.8.0.bb
rename to meta-openembedded/meta-oe/recipes-test/gtest/gtest_1.8.0.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-test/pm-qa/pm-qa_git.bb b/meta-openembedded/meta-oe/recipes-test/pm-qa/pm-qa_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-test/pm-qa/pm-qa_git.bb
rename to meta-openembedded/meta-oe/recipes-test/pm-qa/pm-qa_git.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-test/stress-ng/stress-ng/0001-Several-changes-to-fix-musl-build.patch b/meta-openembedded/meta-oe/recipes-test/stress-ng/stress-ng/0001-Several-changes-to-fix-musl-build.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-test/stress-ng/stress-ng/0001-Several-changes-to-fix-musl-build.patch
rename to meta-openembedded/meta-oe/recipes-test/stress-ng/stress-ng/0001-Several-changes-to-fix-musl-build.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-test/stress-ng/stress-ng/0002-stress-fcntl-fix-build-for-musl.patch b/meta-openembedded/meta-oe/recipes-test/stress-ng/stress-ng/0002-stress-fcntl-fix-build-for-musl.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-test/stress-ng/stress-ng/0002-stress-fcntl-fix-build-for-musl.patch
rename to meta-openembedded/meta-oe/recipes-test/stress-ng/stress-ng/0002-stress-fcntl-fix-build-for-musl.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-test/stress-ng/stress-ng_0.09.14.bb b/meta-openembedded/meta-oe/recipes-test/stress-ng/stress-ng_0.09.14.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-test/stress-ng/stress-ng_0.09.14.bb
rename to meta-openembedded/meta-oe/recipes-test/stress-ng/stress-ng_0.09.14.bb
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-test/testfloat/files/0001-Makefile-for-cross-compile-SoftFloat.patch b/meta-openembedded/meta-oe/recipes-test/testfloat/files/0001-Makefile-for-cross-compile-SoftFloat.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-test/testfloat/files/0001-Makefile-for-cross-compile-SoftFloat.patch
rename to meta-openembedded/meta-oe/recipes-test/testfloat/files/0001-Makefile-for-cross-compile-SoftFloat.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-test/testfloat/files/0002-Makefile-for-cross-compile-TestFloat.patch b/meta-openembedded/meta-oe/recipes-test/testfloat/files/0002-Makefile-for-cross-compile-TestFloat.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-test/testfloat/files/0002-Makefile-for-cross-compile-TestFloat.patch
rename to meta-openembedded/meta-oe/recipes-test/testfloat/files/0002-Makefile-for-cross-compile-TestFloat.patch
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-test/testfloat/testfloat_3a.bb b/meta-openembedded/meta-oe/recipes-test/testfloat/testfloat_3a.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-oe/recipes-test/testfloat/testfloat_3a.bb
rename to meta-openembedded/meta-oe/recipes-test/testfloat/testfloat_3a.bb
diff --git a/import-layers/meta-openembedded/meta-perl/COPYING.MIT b/meta-openembedded/meta-perl/COPYING.MIT
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/COPYING.MIT
rename to meta-openembedded/meta-perl/COPYING.MIT
diff --git a/import-layers/meta-openembedded/meta-perl/README b/meta-openembedded/meta-perl/README
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/README
rename to meta-openembedded/meta-perl/README
diff --git a/import-layers/meta-openembedded/meta-perl/conf/layer.conf b/meta-openembedded/meta-perl/conf/layer.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/conf/layer.conf
rename to meta-openembedded/meta-perl/conf/layer.conf
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-extended/logcheck/files/99_logcheck b/meta-openembedded/meta-perl/recipes-extended/logcheck/files/99_logcheck
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-extended/logcheck/files/99_logcheck
rename to meta-openembedded/meta-perl/recipes-extended/logcheck/files/99_logcheck
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-extended/logcheck/logcheck_1.3.18.bb b/meta-openembedded/meta-perl/recipes-extended/logcheck/logcheck_1.3.18.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-extended/logcheck/logcheck_1.3.18.bb
rename to meta-openembedded/meta-perl/recipes-extended/logcheck/logcheck_1.3.18.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-extended/mime-construct/files/fix-mime-construct-help-return-value.patch b/meta-openembedded/meta-perl/recipes-extended/mime-construct/files/fix-mime-construct-help-return-value.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-extended/mime-construct/files/fix-mime-construct-help-return-value.patch
rename to meta-openembedded/meta-perl/recipes-extended/mime-construct/files/fix-mime-construct-help-return-value.patch
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-extended/mime-construct/mime-construct_1.11.bb b/meta-openembedded/meta-perl/recipes-extended/mime-construct/mime-construct_1.11.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-extended/mime-construct/mime-construct_1.11.bb
rename to meta-openembedded/meta-perl/recipes-extended/mime-construct/mime-construct_1.11.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/adduser/adduser_3.116.bb b/meta-openembedded/meta-perl/recipes-perl/adduser/adduser_3.116.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/adduser/adduser_3.116.bb
rename to meta-openembedded/meta-perl/recipes-perl/adduser/adduser_3.116.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/adduser/files/adduser-add-M-option-for-useradd.patch b/meta-openembedded/meta-perl/recipes-perl/adduser/files/adduser-add-M-option-for-useradd.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/adduser/files/adduser-add-M-option-for-useradd.patch
rename to meta-openembedded/meta-perl/recipes-perl/adduser/files/adduser-add-M-option-for-useradd.patch
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libalgorithm/libalgorithm-diff-perl_1.15.bb b/meta-openembedded/meta-perl/recipes-perl/libalgorithm/libalgorithm-diff-perl_1.15.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libalgorithm/libalgorithm-diff-perl_1.15.bb
rename to meta-openembedded/meta-perl/recipes-perl/libalgorithm/libalgorithm-diff-perl_1.15.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libauthen/files/run-ptest b/meta-openembedded/meta-perl/recipes-perl/libauthen/files/run-ptest
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libauthen/files/run-ptest
rename to meta-openembedded/meta-perl/recipes-perl/libauthen/files/run-ptest
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libauthen/libauthen-sasl-perl_2.16.bb b/meta-openembedded/meta-perl/recipes-perl/libauthen/libauthen-sasl-perl_2.16.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libauthen/libauthen-sasl-perl_2.16.bb
rename to meta-openembedded/meta-perl/recipes-perl/libauthen/libauthen-sasl-perl_2.16.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libcapture/libcapture-tiny-perl_0.46.bb b/meta-openembedded/meta-perl/recipes-perl/libcapture/libcapture-tiny-perl_0.46.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libcapture/libcapture-tiny-perl_0.46.bb
rename to meta-openembedded/meta-perl/recipes-perl/libcapture/libcapture-tiny-perl_0.46.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libcgi/libcgi-perl_4.38.bb b/meta-openembedded/meta-perl/recipes-perl/libcgi/libcgi-perl_4.38.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libcgi/libcgi-perl_4.38.bb
rename to meta-openembedded/meta-perl/recipes-perl/libcgi/libcgi-perl_4.38.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libclass/libclass-method-modifiers-perl_2.12.bb b/meta-openembedded/meta-perl/recipes-perl/libclass/libclass-method-modifiers-perl_2.12.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libclass/libclass-method-modifiers-perl_2.12.bb
rename to meta-openembedded/meta-perl/recipes-perl/libclass/libclass-method-modifiers-perl_2.12.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-random-perl_0.11.bb b/meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-random-perl_0.11.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-random-perl_0.11.bb
rename to meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-random-perl_0.11.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-rsa-perl_0.28.bb b/meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-rsa-perl_0.28.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-rsa-perl_0.28.bb
rename to meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-rsa-perl_0.28.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libcurses/libcurses-perl_1.36.bb b/meta-openembedded/meta-perl/recipes-perl/libcurses/libcurses-perl_1.36.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libcurses/libcurses-perl_1.36.bb
rename to meta-openembedded/meta-perl/recipes-perl/libcurses/libcurses-perl_1.36.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libdata/files/run-ptest b/meta-openembedded/meta-perl/recipes-perl/libdata/files/run-ptest
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libdata/files/run-ptest
rename to meta-openembedded/meta-perl/recipes-perl/libdata/files/run-ptest
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libdata/libdata-hexdump-perl_0.02.bb b/meta-openembedded/meta-perl/recipes-perl/libdata/libdata-hexdump-perl_0.02.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libdata/libdata-hexdump-perl_0.02.bb
rename to meta-openembedded/meta-perl/recipes-perl/libdata/libdata-hexdump-perl_0.02.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libdb/libdbd-sqlite-perl/sqlite-perl-test.pl b/meta-openembedded/meta-perl/recipes-perl/libdb/libdbd-sqlite-perl/sqlite-perl-test.pl
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libdb/libdbd-sqlite-perl/sqlite-perl-test.pl
rename to meta-openembedded/meta-perl/recipes-perl/libdb/libdbd-sqlite-perl/sqlite-perl-test.pl
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libdb/libdbd-sqlite-perl_1.54.bb b/meta-openembedded/meta-perl/recipes-perl/libdb/libdbd-sqlite-perl_1.54.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libdb/libdbd-sqlite-perl_1.54.bb
rename to meta-openembedded/meta-perl/recipes-perl/libdb/libdbd-sqlite-perl_1.54.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libdevel/libdevel-globaldestruction-perl_0.14.bb b/meta-openembedded/meta-perl/recipes-perl/libdevel/libdevel-globaldestruction-perl_0.14.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libdevel/libdevel-globaldestruction-perl_0.14.bb
rename to meta-openembedded/meta-perl/recipes-perl/libdevel/libdevel-globaldestruction-perl_0.14.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libdigest/files/run-ptest b/meta-openembedded/meta-perl/recipes-perl/libdigest/files/run-ptest
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libdigest/files/run-ptest
rename to meta-openembedded/meta-perl/recipes-perl/libdigest/files/run-ptest
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libdigest/libdigest-hmac-perl_1.03.bb b/meta-openembedded/meta-perl/recipes-perl/libdigest/libdigest-hmac-perl_1.03.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libdigest/libdigest-hmac-perl_1.03.bb
rename to meta-openembedded/meta-perl/recipes-perl/libdigest/libdigest-hmac-perl_1.03.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libdigest/libdigest-sha1-perl_2.13.bb b/meta-openembedded/meta-perl/recipes-perl/libdigest/libdigest-sha1-perl_2.13.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libdigest/libdigest-sha1-perl_2.13.bb
rename to meta-openembedded/meta-perl/recipes-perl/libdigest/libdigest-sha1-perl_2.13.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libencode/libencode-locale-perl_1.05.bb b/meta-openembedded/meta-perl/recipes-perl/libencode/libencode-locale-perl_1.05.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libencode/libencode-locale-perl_1.05.bb
rename to meta-openembedded/meta-perl/recipes-perl/libencode/libencode-locale-perl_1.05.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libencode/libencode-perl_2.94.bb b/meta-openembedded/meta-perl/recipes-perl/libencode/libencode-perl_2.94.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libencode/libencode-perl_2.94.bb
rename to meta-openembedded/meta-perl/recipes-perl/libencode/libencode-perl_2.94.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libextutils/libextutils-config-perl_0.008.bb b/meta-openembedded/meta-perl/recipes-perl/libextutils/libextutils-config-perl_0.008.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libextutils/libextutils-config-perl_0.008.bb
rename to meta-openembedded/meta-perl/recipes-perl/libextutils/libextutils-config-perl_0.008.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libextutils/libextutils-cppguess-perl_0.12.bb b/meta-openembedded/meta-perl/recipes-perl/libextutils/libextutils-cppguess-perl_0.12.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libextutils/libextutils-cppguess-perl_0.12.bb
rename to meta-openembedded/meta-perl/recipes-perl/libextutils/libextutils-cppguess-perl_0.12.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libextutils/libextutils-helpers-perl_0.026.bb b/meta-openembedded/meta-perl/recipes-perl/libextutils/libextutils-helpers-perl_0.026.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libextutils/libextutils-helpers-perl_0.026.bb
rename to meta-openembedded/meta-perl/recipes-perl/libextutils/libextutils-helpers-perl_0.026.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libextutils/libextutils-installpaths-perl_0.011.bb b/meta-openembedded/meta-perl/recipes-perl/libextutils/libextutils-installpaths-perl_0.011.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libextutils/libextutils-installpaths-perl_0.011.bb
rename to meta-openembedded/meta-perl/recipes-perl/libextutils/libextutils-installpaths-perl_0.011.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libextutils/libextutils-parsexs-perl_3.35.bb b/meta-openembedded/meta-perl/recipes-perl/libextutils/libextutils-parsexs-perl_3.35.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libextutils/libextutils-parsexs-perl_3.35.bb
rename to meta-openembedded/meta-perl/recipes-perl/libextutils/libextutils-parsexs-perl_3.35.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libfile/libfile-slurp-perl_9999.19.bb b/meta-openembedded/meta-perl/recipes-perl/libfile/libfile-slurp-perl_9999.19.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libfile/libfile-slurp-perl_9999.19.bb
rename to meta-openembedded/meta-perl/recipes-perl/libfile/libfile-slurp-perl_9999.19.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libhtml/files/bin-htmltree-fix-shebang.patch b/meta-openembedded/meta-perl/recipes-perl/libhtml/files/bin-htmltree-fix-shebang.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libhtml/files/bin-htmltree-fix-shebang.patch
rename to meta-openembedded/meta-perl/recipes-perl/libhtml/files/bin-htmltree-fix-shebang.patch
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libhtml/libhtml-parser-perl_3.72.bb b/meta-openembedded/meta-perl/recipes-perl/libhtml/libhtml-parser-perl_3.72.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libhtml/libhtml-parser-perl_3.72.bb
rename to meta-openembedded/meta-perl/recipes-perl/libhtml/libhtml-parser-perl_3.72.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libhtml/libhtml-tree-perl_5.03.bb b/meta-openembedded/meta-perl/recipes-perl/libhtml/libhtml-tree-perl_5.03.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libhtml/libhtml-tree-perl_5.03.bb
rename to meta-openembedded/meta-perl/recipes-perl/libhtml/libhtml-tree-perl_5.03.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libimport/libimport-into-perl_1.002004.bb b/meta-openembedded/meta-perl/recipes-perl/libimport/libimport-into-perl_1.002004.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libimport/libimport-into-perl_1.002004.bb
rename to meta-openembedded/meta-perl/recipes-perl/libimport/libimport-into-perl_1.002004.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libio/files/run-ptest b/meta-openembedded/meta-perl/recipes-perl/libio/files/run-ptest
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libio/files/run-ptest
rename to meta-openembedded/meta-perl/recipes-perl/libio/files/run-ptest
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.054.bb b/meta-openembedded/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.054.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.054.bb
rename to meta-openembedded/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.054.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libio/libio-stringy-perl_2.111.bb b/meta-openembedded/meta-perl/recipes-perl/libio/libio-stringy-perl_2.111.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libio/libio-stringy-perl_2.111.bb
rename to meta-openembedded/meta-perl/recipes-perl/libio/libio-stringy-perl_2.111.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libipc/libipc-signal-perl_1.00.bb b/meta-openembedded/meta-perl/recipes-perl/libipc/libipc-signal-perl_1.00.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libipc/libipc-signal-perl_1.00.bb
rename to meta-openembedded/meta-perl/recipes-perl/libipc/libipc-signal-perl_1.00.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/liblocale/liblocale-gettext-perl_1.07.bb b/meta-openembedded/meta-perl/recipes-perl/liblocale/liblocale-gettext-perl_1.07.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/liblocale/liblocale-gettext-perl_1.07.bb
rename to meta-openembedded/meta-perl/recipes-perl/liblocale/liblocale-gettext-perl_1.07.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libmime/files/run-ptest b/meta-openembedded/meta-perl/recipes-perl/libmime/files/run-ptest
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libmime/files/run-ptest
rename to meta-openembedded/meta-perl/recipes-perl/libmime/files/run-ptest
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libmime/libmime-charset-perl_1.012.2.bb b/meta-openembedded/meta-perl/recipes-perl/libmime/libmime-charset-perl_1.012.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libmime/libmime-charset-perl_1.012.2.bb
rename to meta-openembedded/meta-perl/recipes-perl/libmime/libmime-charset-perl_1.012.2.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libmime/libmime-types-perl_2.17.bb b/meta-openembedded/meta-perl/recipes-perl/libmime/libmime-types-perl_2.17.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libmime/libmime-types-perl_2.17.bb
rename to meta-openembedded/meta-perl/recipes-perl/libmime/libmime-types-perl_2.17.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libmodule/libmodule-build-perl_0.4224.bb b/meta-openembedded/meta-perl/recipes-perl/libmodule/libmodule-build-perl_0.4224.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libmodule/libmodule-build-perl_0.4224.bb
rename to meta-openembedded/meta-perl/recipes-perl/libmodule/libmodule-build-perl_0.4224.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libmodule/libmodule-build-tiny-perl_0.039.bb b/meta-openembedded/meta-perl/recipes-perl/libmodule/libmodule-build-tiny-perl_0.039.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libmodule/libmodule-build-tiny-perl_0.039.bb
rename to meta-openembedded/meta-perl/recipes-perl/libmodule/libmodule-build-tiny-perl_0.039.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libmodule/libmodule-pluggable-perl_5.2.bb b/meta-openembedded/meta-perl/recipes-perl/libmodule/libmodule-pluggable-perl_5.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libmodule/libmodule-pluggable-perl_5.2.bb
rename to meta-openembedded/meta-perl/recipes-perl/libmodule/libmodule-pluggable-perl_5.2.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libmodule/libmodule-runtime-perl_0.016.bb b/meta-openembedded/meta-perl/recipes-perl/libmodule/libmodule-runtime-perl_0.016.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libmodule/libmodule-runtime-perl_0.016.bb
rename to meta-openembedded/meta-perl/recipes-perl/libmodule/libmodule-runtime-perl_0.016.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libmoo/libmoo-perl_2.003004.bb b/meta-openembedded/meta-perl/recipes-perl/libmoo/libmoo-perl_2.003004.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libmoo/libmoo-perl_2.003004.bb
rename to meta-openembedded/meta-perl/recipes-perl/libmoo/libmoo-perl_2.003004.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libnet/files/run-ptest b/meta-openembedded/meta-perl/recipes-perl/libnet/files/run-ptest
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libnet/files/run-ptest
rename to meta-openembedded/meta-perl/recipes-perl/libnet/files/run-ptest
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.14.bb b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.14.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.14.bb
rename to meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.14.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ldap-perl_0.65.bb b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ldap-perl_0.65.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ldap-perl_0.65.bb
rename to meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ldap-perl_0.65.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-libidn-perl-0.12/libidn-wr-cross-compile.patch b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-libidn-perl-0.12/libidn-wr-cross-compile.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-libidn-perl-0.12/libidn-wr-cross-compile.patch
rename to meta-openembedded/meta-perl/recipes-perl/libnet/libnet-libidn-perl-0.12/libidn-wr-cross-compile.patch
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-libidn-perl_0.12.bb b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-libidn-perl_0.12.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-libidn-perl_0.12.bb
rename to meta-openembedded/meta-perl/recipes-perl/libnet/libnet-libidn-perl_0.12.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.84.bb b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.84.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.84.bb
rename to meta-openembedded/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.84.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-telnet-perl_3.04.bb b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-telnet-perl_3.04.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-telnet-perl_3.04.bb
rename to meta-openembedded/meta-perl/recipes-perl/libnet/libnet-telnet-perl_3.04.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libproc/libproc-waitstat-perl_1.00.bb b/meta-openembedded/meta-perl/recipes-perl/libproc/libproc-waitstat-perl_1.00.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libproc/libproc-waitstat-perl_1.00.bb
rename to meta-openembedded/meta-perl/recipes-perl/libproc/libproc-waitstat-perl_1.00.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/librole/librole-tiny-perl_2.000006.bb b/meta-openembedded/meta-perl/recipes-perl/librole/librole-tiny-perl_2.000006.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/librole/librole-tiny-perl_2.000006.bb
rename to meta-openembedded/meta-perl/recipes-perl/librole/librole-tiny-perl_2.000006.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libstrictures/libstrictures-perl_2.000003.bb b/meta-openembedded/meta-perl/recipes-perl/libstrictures/libstrictures-perl_2.000003.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libstrictures/libstrictures-perl_2.000003.bb
rename to meta-openembedded/meta-perl/recipes-perl/libstrictures/libstrictures-perl_2.000003.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libsub/libsub-exporter-progressive-perl_0.001013.bb b/meta-openembedded/meta-perl/recipes-perl/libsub/libsub-exporter-progressive-perl_0.001013.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libsub/libsub-exporter-progressive-perl_0.001013.bb
rename to meta-openembedded/meta-perl/recipes-perl/libsub/libsub-exporter-progressive-perl_0.001013.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libterm/libterm-readkey-perl_2.37.bb b/meta-openembedded/meta-perl/recipes-perl/libterm/libterm-readkey-perl_2.37.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libterm/libterm-readkey-perl_2.37.bb
rename to meta-openembedded/meta-perl/recipes-perl/libterm/libterm-readkey-perl_2.37.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libtest/libtest-harness-perl_3.42.bb b/meta-openembedded/meta-perl/recipes-perl/libtest/libtest-harness-perl_3.42.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libtest/libtest-harness-perl_3.42.bb
rename to meta-openembedded/meta-perl/recipes-perl/libtest/libtest-harness-perl_3.42.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libtext/libtext-charwidth-perl_0.04.bb b/meta-openembedded/meta-perl/recipes-perl/libtext/libtext-charwidth-perl_0.04.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libtext/libtext-charwidth-perl_0.04.bb
rename to meta-openembedded/meta-perl/recipes-perl/libtext/libtext-charwidth-perl_0.04.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libtext/libtext-diff-perl_1.41.bb b/meta-openembedded/meta-perl/recipes-perl/libtext/libtext-diff-perl_1.41.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libtext/libtext-diff-perl_1.41.bb
rename to meta-openembedded/meta-perl/recipes-perl/libtext/libtext-diff-perl_1.41.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libtext/libtext-iconv-perl_1.7.bb b/meta-openembedded/meta-perl/recipes-perl/libtext/libtext-iconv-perl_1.7.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libtext/libtext-iconv-perl_1.7.bb
rename to meta-openembedded/meta-perl/recipes-perl/libtext/libtext-iconv-perl_1.7.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libtext/libtext-wrapi18n-perl_0.06.bb b/meta-openembedded/meta-perl/recipes-perl/libtext/libtext-wrapi18n-perl_0.06.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libtext/libtext-wrapi18n-perl_0.06.bb
rename to meta-openembedded/meta-perl/recipes-perl/libtext/libtext-wrapi18n-perl_0.06.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libunicode/libunicode-linebreak-perl_2017.004.bb b/meta-openembedded/meta-perl/recipes-perl/libunicode/libunicode-linebreak-perl_2017.004.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libunicode/libunicode-linebreak-perl_2017.004.bb
rename to meta-openembedded/meta-perl/recipes-perl/libunicode/libunicode-linebreak-perl_2017.004.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-filter-buffertext-perl_1.01.bb b/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-filter-buffertext-perl_1.01.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-filter-buffertext-perl_1.01.bb
rename to meta-openembedded/meta-perl/recipes-perl/libxml/libxml-filter-buffertext-perl_1.01.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl/disable-libxml2-check.patch b/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl/disable-libxml2-check.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl/disable-libxml2-check.patch
rename to meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl/disable-libxml2-check.patch
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl/fix-CATALOG-conditional-compile.patch b/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl/fix-CATALOG-conditional-compile.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl/fix-CATALOG-conditional-compile.patch
rename to meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl/fix-CATALOG-conditional-compile.patch
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl/using-DOCB-conditional.patch b/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl/using-DOCB-conditional.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl/using-DOCB-conditional.patch
rename to meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl/using-DOCB-conditional.patch
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl_2.0132.bb b/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl_2.0132.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl_2.0132.bb
rename to meta-openembedded/meta-perl/recipes-perl/libxml/libxml-libxml-perl_2.0132.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-sax-writer-perl_0.57.bb b/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-sax-writer-perl_0.57.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/libxml/libxml-sax-writer-perl_0.57.bb
rename to meta-openembedded/meta-perl/recipes-perl/libxml/libxml-sax-writer-perl_0.57.bb
diff --git a/import-layers/meta-openembedded/meta-perl/recipes-perl/po4a/po4a_0.49.bb b/meta-openembedded/meta-perl/recipes-perl/po4a/po4a_0.49.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-perl/recipes-perl/po4a/po4a_0.49.bb
rename to meta-openembedded/meta-perl/recipes-perl/po4a/po4a_0.49.bb
diff --git a/import-layers/meta-openembedded/meta-python/COPYING.MIT b/meta-openembedded/meta-python/COPYING.MIT
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/COPYING.MIT
rename to meta-openembedded/meta-python/COPYING.MIT
diff --git a/import-layers/meta-openembedded/meta-python/README b/meta-openembedded/meta-python/README
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/README
rename to meta-openembedded/meta-python/README
diff --git a/import-layers/meta-openembedded/meta-python/conf/layer.conf b/meta-openembedded/meta-python/conf/layer.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/conf/layer.conf
rename to meta-openembedded/meta-python/conf/layer.conf
diff --git a/import-layers/meta-openembedded/meta-python/licenses/LLNL b/meta-openembedded/meta-python/licenses/LLNL
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/licenses/LLNL
rename to meta-openembedded/meta-python/licenses/LLNL
diff --git a/import-layers/meta-openembedded/meta-python/licenses/Unicode b/meta-openembedded/meta-python/licenses/Unicode
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/licenses/Unicode
rename to meta-openembedded/meta-python/licenses/Unicode
diff --git a/import-layers/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone/80oe.conf.in b/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone/80oe.conf.in
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone/80oe.conf.in
rename to meta-openembedded/meta-python/recipes-connectivity/gateone/gateone/80oe.conf.in
diff --git a/import-layers/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone/gateone-avahi.service b/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone/gateone-avahi.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone/gateone-avahi.service
rename to meta-openembedded/meta-python/recipes-connectivity/gateone/gateone/gateone-avahi.service
diff --git a/import-layers/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone/gateone-init.in b/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone/gateone-init.in
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone/gateone-init.in
rename to meta-openembedded/meta-python/recipes-connectivity/gateone/gateone/gateone-init.in
diff --git a/import-layers/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone/gateone.service.in b/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone/gateone.service.in
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone/gateone.service.in
rename to meta-openembedded/meta-python/recipes-connectivity/gateone/gateone/gateone.service.in
diff --git a/import-layers/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone_git.bb b/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-connectivity/gateone/gateone_git.bb
rename to meta-openembedded/meta-python/recipes-connectivity/gateone/gateone_git.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-connectivity/python-gsocketpool/python-gsocketpool.inc b/meta-openembedded/meta-python/recipes-connectivity/python-gsocketpool/python-gsocketpool.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-connectivity/python-gsocketpool/python-gsocketpool.inc
rename to meta-openembedded/meta-python/recipes-connectivity/python-gsocketpool/python-gsocketpool.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-connectivity/python-gsocketpool/python-gsocketpool_0.1.6.bb b/meta-openembedded/meta-python/recipes-connectivity/python-gsocketpool/python-gsocketpool_0.1.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-connectivity/python-gsocketpool/python-gsocketpool_0.1.6.bb
rename to meta-openembedded/meta-python/recipes-connectivity/python-gsocketpool/python-gsocketpool_0.1.6.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-connectivity/python-gsocketpool/python3-gsocketpool_0.1.6.bb b/meta-openembedded/meta-python/recipes-connectivity/python-gsocketpool/python3-gsocketpool_0.1.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-connectivity/python-gsocketpool/python3-gsocketpool_0.1.6.bb
rename to meta-openembedded/meta-python/recipes-connectivity/python-gsocketpool/python3-gsocketpool_0.1.6.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-connectivity/python-mprpc/python-mprpc.inc b/meta-openembedded/meta-python/recipes-connectivity/python-mprpc/python-mprpc.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-connectivity/python-mprpc/python-mprpc.inc
rename to meta-openembedded/meta-python/recipes-connectivity/python-mprpc/python-mprpc.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-connectivity/python-mprpc/python-mprpc_0.1.16.bb b/meta-openembedded/meta-python/recipes-connectivity/python-mprpc/python-mprpc_0.1.16.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-connectivity/python-mprpc/python-mprpc_0.1.16.bb
rename to meta-openembedded/meta-python/recipes-connectivity/python-mprpc/python-mprpc_0.1.16.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-connectivity/python-mprpc/python3-mprpc_0.1.16.bb b/meta-openembedded/meta-python/recipes-connectivity/python-mprpc/python3-mprpc_0.1.16.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-connectivity/python-mprpc/python3-mprpc_0.1.16.bb
rename to meta-openembedded/meta-python/recipes-connectivity/python-mprpc/python3-mprpc_0.1.16.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-connectivity/python-pyconnman/python-pyconnman_0.1.0.bb b/meta-openembedded/meta-python/recipes-connectivity/python-pyconnman/python-pyconnman_0.1.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-connectivity/python-pyconnman/python-pyconnman_0.1.0.bb
rename to meta-openembedded/meta-python/recipes-connectivity/python-pyconnman/python-pyconnman_0.1.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-connectivity/python-pyro4/python-pyro4_4.63.bb b/meta-openembedded/meta-python/recipes-connectivity/python-pyro4/python-pyro4_4.63.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-connectivity/python-pyro4/python-pyro4_4.63.bb
rename to meta-openembedded/meta-python/recipes-connectivity/python-pyro4/python-pyro4_4.63.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-connectivity/python-pytun/python-pytun.inc b/meta-openembedded/meta-python/recipes-connectivity/python-pytun/python-pytun.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-connectivity/python-pytun/python-pytun.inc
rename to meta-openembedded/meta-python/recipes-connectivity/python-pytun/python-pytun.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-connectivity/python-pytun/python-pytun_2.2.1.bb b/meta-openembedded/meta-python/recipes-connectivity/python-pytun/python-pytun_2.2.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-connectivity/python-pytun/python-pytun_2.2.1.bb
rename to meta-openembedded/meta-python/recipes-connectivity/python-pytun/python-pytun_2.2.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-connectivity/python-pytun/python3-pytun_2.2.1.bb b/meta-openembedded/meta-python/recipes-connectivity/python-pytun/python3-pytun_2.2.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-connectivity/python-pytun/python3-pytun_2.2.1.bb
rename to meta-openembedded/meta-python/recipes-connectivity/python-pytun/python3-pytun_2.2.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-connectivity/python-thrift/python-thrift_0.11.0.bb b/meta-openembedded/meta-python/recipes-connectivity/python-thrift/python-thrift_0.11.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-connectivity/python-thrift/python-thrift_0.11.0.bb
rename to meta-openembedded/meta-python/recipes-connectivity/python-thrift/python-thrift_0.11.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-connectivity/python-txws/python-txws_0.9.1.bb b/meta-openembedded/meta-python/recipes-connectivity/python-txws/python-txws_0.9.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-connectivity/python-txws/python-txws_0.9.1.bb
rename to meta-openembedded/meta-python/recipes-connectivity/python-txws/python-txws_0.9.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-connectivity/telepathy/telepathy-python-0.15.19/parallel_make.patch b/meta-openembedded/meta-python/recipes-connectivity/telepathy/telepathy-python-0.15.19/parallel_make.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-connectivity/telepathy/telepathy-python-0.15.19/parallel_make.patch
rename to meta-openembedded/meta-python/recipes-connectivity/telepathy/telepathy-python-0.15.19/parallel_make.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-connectivity/telepathy/telepathy-python-0.15.19/remove_duplicate_install.patch b/meta-openembedded/meta-python/recipes-connectivity/telepathy/telepathy-python-0.15.19/remove_duplicate_install.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-connectivity/telepathy/telepathy-python-0.15.19/remove_duplicate_install.patch
rename to meta-openembedded/meta-python/recipes-connectivity/telepathy/telepathy-python-0.15.19/remove_duplicate_install.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-connectivity/telepathy/telepathy-python-0.15.19/telepathy-python_fix_for_automake_1.12.patch b/meta-openembedded/meta-python/recipes-connectivity/telepathy/telepathy-python-0.15.19/telepathy-python_fix_for_automake_1.12.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-connectivity/telepathy/telepathy-python-0.15.19/telepathy-python_fix_for_automake_1.12.patch
rename to meta-openembedded/meta-python/recipes-connectivity/telepathy/telepathy-python-0.15.19/telepathy-python_fix_for_automake_1.12.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb b/meta-openembedded/meta-python/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb
rename to meta-openembedded/meta-python/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/pyrtm_0.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/pyrtm_0.4.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/pyrtm_0.4.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/pyrtm_0.4.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-alembic.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-alembic.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-alembic.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-alembic.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-alembic_0.9.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-alembic_0.9.8.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-alembic_0.9.8.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-alembic_0.9.8.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-anyjson.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-anyjson.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-anyjson.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-anyjson.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-anyjson_0.3.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-anyjson_0.3.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-anyjson_0.3.3.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-anyjson_0.3.3.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-appdirs.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-appdirs.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-appdirs.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-appdirs.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-appdirs_1.4.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-appdirs_1.4.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-appdirs_1.4.3.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-appdirs_1.4.3.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-asn1crypto.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-asn1crypto.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-asn1crypto.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-asn1crypto.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-asn1crypto_0.24.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-asn1crypto_0.24.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-asn1crypto_0.24.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-asn1crypto_0.24.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-astroid.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-astroid.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-astroid.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-astroid.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-astroid_1.6.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-astroid_1.6.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-astroid_1.6.3.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-astroid_1.6.3.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-attr.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-attr.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-attr.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-attr.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-attr_0.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-attr_0.3.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-attr_0.3.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-attr_0.3.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-attrs.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-attrs.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-attrs.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-attrs.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-attrs_17.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-attrs_17.4.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-attrs_17.4.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-attrs_17.4.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-automat.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-automat.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-automat.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-automat.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-automat/0001-setup.py-remove-the-dependency-on-m2r.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-automat/0001-setup.py-remove-the-dependency-on-m2r.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-automat/0001-setup.py-remove-the-dependency-on-m2r.patch
rename to meta-openembedded/meta-python/recipes-devtools/python/python-automat/0001-setup.py-remove-the-dependency-on-m2r.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-automat_0.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-automat_0.6.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-automat_0.6.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-automat_0.6.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python_1.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python_1.3.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python_1.3.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-aws-iot-device-sdk-python_1.3.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-babel.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-babel.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-babel.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-babel.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-babel_2.5.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-babel_2.5.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-babel_2.5.3.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-babel_2.5.3.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-backports-abc_0.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-backports-abc_0.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-backports-abc_0.4.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-backports-abc_0.4.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-backports-functools-lru-cache_1.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-backports-functools-lru-cache_1.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-backports-functools-lru-cache_1.4.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-backports-functools-lru-cache_1.4.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-backports-ssl_3.5.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-backports-ssl_3.5.0.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-backports-ssl_3.5.0.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-backports-ssl_3.5.0.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-bcrypt.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-bcrypt.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-bcrypt.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-bcrypt.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-bcrypt_3.1.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-bcrypt_3.1.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-bcrypt_3.1.4.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-bcrypt_3.1.4.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-beautifulsoup4.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-beautifulsoup4.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-beautifulsoup4.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-beautifulsoup4.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-beautifulsoup4_4.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-beautifulsoup4_4.6.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-beautifulsoup4_4.6.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-beautifulsoup4_4.6.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-behave_1.2.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-behave_1.2.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-behave_1.2.6.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-behave_1.2.6.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-bitarray.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-bitarray.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-bitarray.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-bitarray.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-bitarray_0.8.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-bitarray_0.8.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-bitarray_0.8.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-bitarray_0.8.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-blinker.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-blinker.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-blinker.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-blinker.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-blinker_1.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-blinker_1.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-blinker_1.4.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-blinker_1.4.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-can.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-can.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-can.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-can.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-can_2.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-can_2.1.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-can_2.1.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-can_2.1.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-cassandra-driver.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-cassandra-driver.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-cassandra-driver.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-cassandra-driver.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-certifi.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-certifi.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-certifi.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-certifi.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-certifi_2018.1.18.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-certifi_2018.1.18.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-certifi_2018.1.18.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-certifi_2018.1.18.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-cffi.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-cffi.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-cffi.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-cffi.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-cffi_1.11.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-cffi_1.11.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-cffi_1.11.5.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-cffi_1.11.5.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-chardet.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-chardet.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-chardet.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-chardet.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-chardet_3.0.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-chardet_3.0.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-chardet_3.0.4.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-chardet_3.0.4.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-cheetah_2.4.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-cheetah_2.4.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-cheetah_2.4.4.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-cheetah_2.4.4.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-click.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-click.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-click.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-click.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-click_6.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-click_6.7.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-click_6.7.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-click_6.7.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-cmd2_0.8.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-cmd2_0.8.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-cmd2_0.8.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-cmd2_0.8.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-configparser.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-configparser.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-configparser.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-configparser.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-configparser_3.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-configparser_3.5.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-configparser_3.5.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-configparser_3.5.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-constantly.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-constantly.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-constantly.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-constantly.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-constantly_15.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-constantly_15.1.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-constantly_15.1.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-constantly_15.1.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-cryptography-vectors.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-cryptography-vectors.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-cryptography-vectors.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-cryptography-vectors.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-cryptography-vectors_2.1.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-cryptography-vectors_2.1.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-cryptography-vectors_2.1.4.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-cryptography-vectors_2.1.4.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-cryptography.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-cryptography.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-cryptography.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-cryptography.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-cryptography/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python-cryptography/run-ptest
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-cryptography/run-ptest
rename to meta-openembedded/meta-python/recipes-devtools/python/python-cryptography/run-ptest
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-cryptography_2.1.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-cryptography_2.1.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-cryptography_2.1.4.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-cryptography_2.1.4.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-cython.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-cython.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-cython.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-cython.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-cython_0.28.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-cython_0.28.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-cython_0.28.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-cython_0.28.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-daemon/0001-Workaround-for-issue-2-1.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-daemon/0001-Workaround-for-issue-2-1.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-daemon/0001-Workaround-for-issue-2-1.patch
rename to meta-openembedded/meta-python/recipes-devtools/python/python-daemon/0001-Workaround-for-issue-2-1.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-daemon_2.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-daemon_2.1.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-daemon_2.1.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-daemon_2.1.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-daemonize_2.4.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-daemonize_2.4.7.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-daemonize_2.4.7.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-daemonize_2.4.7.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-dateutil.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-dateutil.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-dateutil.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-dateutil.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-dateutil_2.7.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-dateutil_2.7.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-dateutil_2.7.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-dateutil_2.7.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-dbus_1.2.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-dbus_1.2.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-dbus_1.2.6.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-dbus_1.2.6.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-dbusmock/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-dbusmock/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-dbusmock/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch
rename to meta-openembedded/meta-python/recipes-devtools/python/python-dbusmock/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-dbusmock/0002-Add-possibility-to-import-templates-from-packages.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-dbusmock/0002-Add-possibility-to-import-templates-from-packages.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-dbusmock/0002-Add-possibility-to-import-templates-from-packages.patch
rename to meta-openembedded/meta-python/recipes-devtools/python/python-dbusmock/0002-Add-possibility-to-import-templates-from-packages.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-dbusmock_0.16.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-dbusmock_0.16.7.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-dbusmock_0.16.7.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-dbusmock_0.16.7.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-decorator.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-decorator.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-decorator.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-decorator.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-decorator_4.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-decorator_4.3.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-decorator_4.3.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-decorator_4.3.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-django-south.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-django-south.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-django-south.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-django-south.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-django-south_1.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-django-south_1.0.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-django-south_1.0.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-django-south_1.0.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-django.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-django.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-django.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-django.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-django_1.11.10.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-django_1.11.10.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-django_1.11.10.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-django_1.11.10.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-dnspython.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-dnspython.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-dnspython.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-dnspython.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-dnspython_1.15.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-dnspython_1.15.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-dnspython_1.15.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-dnspython_1.15.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-docutils_0.14rc2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-docutils_0.14rc2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-docutils_0.14rc2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-docutils_0.14rc2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-dominate.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-dominate.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-dominate.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-dominate.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-dominate_2.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-dominate_2.3.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-dominate_2.3.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-dominate_2.3.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-editor.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-editor.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-editor.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-editor.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-editor_1.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-editor_1.0.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-editor_1.0.3.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-editor_1.0.3.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-enum34_1.1.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-enum34_1.1.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-enum34_1.1.6.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-enum34_1.1.6.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-epydoc_3.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-epydoc_3.0.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-epydoc_3.0.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-epydoc_3.0.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-evdev.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-evdev.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-evdev.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-evdev.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-evdev_0.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-evdev_0.7.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-evdev_0.7.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-evdev_0.7.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-feedformatter.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-feedformatter.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-feedformatter.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-feedformatter.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-feedformatter_0.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-feedformatter_0.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-feedformatter_0.4.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-feedformatter_0.4.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-feedparser_5.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-feedparser_5.2.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-feedparser_5.2.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-feedparser_5.2.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-babel.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-babel.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-babel.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-flask-babel.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-babel_0.11.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-babel_0.11.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-babel_0.11.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-flask-babel_0.11.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-bcrypt_0.7.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-bcrypt_0.7.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-bcrypt_0.7.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-flask-bcrypt_0.7.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-bootstrap.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-bootstrap.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-bootstrap.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-flask-bootstrap.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-bootstrap_3.3.7.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-bootstrap_3.3.7.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-bootstrap_3.3.7.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-flask-bootstrap_3.3.7.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-login.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-login.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-login.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-flask-login.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-login_0.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-login_0.4.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-login_0.4.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-flask-login_0.4.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-mail.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-mail.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-mail.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-flask-mail.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-mail_0.9.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-mail_0.9.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-mail_0.9.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-flask-mail_0.9.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-migrate.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-migrate.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-migrate.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-flask-migrate.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-migrate_2.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-migrate_2.1.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-migrate_2.1.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-flask-migrate_2.1.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-nav.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-nav.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-nav.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-flask-nav.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-nav_0.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-nav_0.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-nav_0.6.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-flask-nav_0.6.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-navigation_0.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-navigation_0.2.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-navigation_0.2.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-flask-navigation_0.2.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-pymongo.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-pymongo.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-pymongo.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-flask-pymongo.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-pymongo_0.5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-pymongo_0.5.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-pymongo_0.5.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-flask-pymongo_0.5.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-restful.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-restful.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-restful.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-flask-restful.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-restful_0.3.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-restful_0.3.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-restful_0.3.6.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-flask-restful_0.3.6.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-script.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-script.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-script.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-flask-script.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-script_2.0.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-script_2.0.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-script_2.0.6.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-flask-script_2.0.6.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-sqlalchemy.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-sqlalchemy.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-sqlalchemy.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-flask-sqlalchemy.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-sqlalchemy_2.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-sqlalchemy_2.3.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-sqlalchemy_2.3.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-flask-sqlalchemy_2.3.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-uploads.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-uploads.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-uploads.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-flask-uploads.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-uploads_0.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-uploads_0.2.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-uploads_0.2.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-flask-uploads_0.2.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-user.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-user.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-user.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-flask-user.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-user_0.6.19.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-user_0.6.19.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-user_0.6.19.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-flask-user_0.6.19.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-wtf.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-wtf.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-wtf.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-flask-wtf.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-wtf_0.14.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-wtf_0.14.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-wtf_0.14.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-flask-wtf_0.14.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-xstatic.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-xstatic.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-xstatic.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-flask-xstatic.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-xstatic/remove-pip-requires.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-xstatic/remove-pip-requires.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-xstatic/remove-pip-requires.patch
rename to meta-openembedded/meta-python/recipes-devtools/python/python-flask-xstatic/remove-pip-requires.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-xstatic_0.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-xstatic_0.0.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask-xstatic_0.0.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-flask-xstatic_0.0.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-flask.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-flask.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask_0.12.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-flask_0.12.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-flask_0.12.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-flask_0.12.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-funcsigs_1.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-funcsigs_1.0.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-funcsigs_1.0.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-funcsigs_1.0.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-functools32_3.2.3-2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-functools32_3.2.3-2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-functools32_3.2.3-2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-functools32_3.2.3-2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-future_0.16.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-future_0.16.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-future_0.16.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-future_0.16.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-gdata_2.0.18.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-gdata_2.0.18.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-gdata_2.0.18.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-gdata_2.0.18.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-gevent.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-gevent.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-gevent.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-gevent.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-gevent/libev-conf.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-gevent/libev-conf.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-gevent/libev-conf.patch
rename to meta-openembedded/meta-python/recipes-devtools/python/python-gevent/libev-conf.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-gevent_1.2.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-gevent_1.2.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-gevent_1.2.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-gevent_1.2.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-greenlet.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-greenlet.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-greenlet.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-greenlet.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-greenlet_0.4.13.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-greenlet_0.4.13.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-greenlet_0.4.13.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-greenlet_0.4.13.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-grpcio-tools_1.8.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-grpcio-tools_1.8.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-grpcio-tools_1.8.4.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-grpcio-tools_1.8.4.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch
rename to meta-openembedded/meta-python/recipes-devtools/python/python-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-grpcio_1.8.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-grpcio_1.8.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-grpcio_1.8.4.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-grpcio_1.8.4.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-html5lib.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-html5lib.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-html5lib.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-html5lib.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-html5lib_1.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-html5lib_1.0.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-html5lib_1.0.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-html5lib_1.0.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-humanize.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-humanize.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-humanize.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-humanize.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-humanize_0.5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-humanize_0.5.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-humanize_0.5.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-humanize_0.5.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-hyperlink.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-hyperlink.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-hyperlink.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-hyperlink.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-hyperlink_17.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-hyperlink_17.3.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-hyperlink_17.3.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-hyperlink_17.3.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-idna.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-idna.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-idna.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-idna.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-idna_2.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-idna_2.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-idna_2.6.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-idna_2.6.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-imaging/0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-imaging/0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-imaging/0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch
rename to meta-openembedded/meta-python/recipes-devtools/python/python-imaging/0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-imaging/allow.to.disable.some.features.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-imaging/allow.to.disable.some.features.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-imaging/allow.to.disable.some.features.patch
rename to meta-openembedded/meta-python/recipes-devtools/python/python-imaging/allow.to.disable.some.features.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-imaging/fix-freetype-includes.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-imaging/fix-freetype-includes.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-imaging/fix-freetype-includes.patch
rename to meta-openembedded/meta-python/recipes-devtools/python/python-imaging/fix-freetype-includes.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-imaging/python-imaging-CVE-2016-2533.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-imaging/python-imaging-CVE-2016-2533.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-imaging/python-imaging-CVE-2016-2533.patch
rename to meta-openembedded/meta-python/recipes-devtools/python/python-imaging/python-imaging-CVE-2016-2533.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-imaging/remove-host-libdir.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-imaging/remove-host-libdir.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-imaging/remove-host-libdir.patch
rename to meta-openembedded/meta-python/recipes-devtools/python/python-imaging/remove-host-libdir.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-imaging_1.1.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-imaging_1.1.7.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-imaging_1.1.7.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-imaging_1.1.7.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-incremental.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-incremental.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-incremental.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-incremental.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-incremental_17.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-incremental_17.5.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-incremental_17.5.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-incremental_17.5.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-ipaddress_1.0.19.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-ipaddress_1.0.19.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-ipaddress_1.0.19.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-ipaddress_1.0.19.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-iso8601.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-iso8601.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-iso8601.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-iso8601.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-iso8601_0.1.12.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-iso8601_0.1.12.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-iso8601_0.1.12.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-iso8601_0.1.12.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-isort.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-isort.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-isort.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-isort.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-isort_4.3.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-isort_4.3.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-isort_4.3.4.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-isort_4.3.4.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-itsdangerous.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-itsdangerous.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-itsdangerous.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-itsdangerous.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-itsdangerous_0.24.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-itsdangerous_0.24.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-itsdangerous_0.24.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-itsdangerous_0.24.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-javaobj-py3.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-javaobj-py3.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-javaobj-py3.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-javaobj-py3.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-javaobj-py3_0.2.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-javaobj-py3_0.2.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-javaobj-py3_0.2.4.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-javaobj-py3_0.2.4.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-jinja2.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-jinja2.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-jinja2.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-jinja2.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-jinja2_2.10.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-jinja2_2.10.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-jinja2_2.10.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-jinja2_2.10.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-jsonpatch.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-jsonpatch.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-jsonpatch.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-jsonpatch.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-jsonpatch_1.23.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-jsonpatch_1.23.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-jsonpatch_1.23.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-jsonpatch_1.23.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-jsonpointer.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-jsonpointer.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-jsonpointer.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-jsonpointer.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-jsonpointer_2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-jsonpointer_2.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-jsonpointer_2.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-jsonpointer_2.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema_2.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema_2.6.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema_2.6.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-jsonschema_2.6.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-lazy-object-proxy.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-lazy-object-proxy.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-lazy-object-proxy.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-lazy-object-proxy.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-lazy-object-proxy_1.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-lazy-object-proxy_1.3.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-lazy-object-proxy_1.3.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-lazy-object-proxy_1.3.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-lockfile_0.12.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-lockfile_0.12.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-lockfile_0.12.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-lockfile_0.12.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-lxml.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-lxml.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-lxml.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-lxml.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-lxml_4.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-lxml_4.2.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-lxml_4.2.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-lxml_4.2.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch
rename to meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto/0001-setup.py-link-in-sysroot-not-in-host-directories.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto/cross-compile-platform.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto/cross-compile-platform.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto/cross-compile-platform.patch
rename to meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto/cross-compile-platform.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto/m2crypto-0.26.4-gcc_macros.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto/m2crypto-0.26.4-gcc_macros.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto/m2crypto-0.26.4-gcc_macros.patch
rename to meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto/m2crypto-0.26.4-gcc_macros.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto_0.26.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto_0.26.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto_0.26.4.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto_0.26.4.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-mako.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-mako.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-mako.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-mako.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-mako_1.0.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-mako_1.0.7.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-mako_1.0.7.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-mako_1.0.7.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-markupsafe.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-markupsafe.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-markupsafe.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-markupsafe.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-markupsafe_1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-markupsafe_1.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-markupsafe_1.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-markupsafe_1.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-matplotlib/fix_setupext.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-matplotlib/fix_setupext.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-matplotlib/fix_setupext.patch
rename to meta-openembedded/meta-python/recipes-devtools/python/python-matplotlib/fix_setupext.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-matplotlib_2.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-matplotlib_2.0.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-matplotlib_2.0.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-matplotlib_2.0.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-mccabe/0001-python-mccabe-remove-unnecessary-setup_requires-pyte.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-mccabe/0001-python-mccabe-remove-unnecessary-setup_requires-pyte.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-mccabe/0001-python-mccabe-remove-unnecessary-setup_requires-pyte.patch
rename to meta-openembedded/meta-python/recipes-devtools/python/python-mccabe/0001-python-mccabe-remove-unnecessary-setup_requires-pyte.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-mccabe_0.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-mccabe_0.4.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-mccabe_0.4.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-mccabe_0.4.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-mock_2.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-mock_2.0.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-mock_2.0.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-mock_2.0.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-monotonic_1.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-monotonic_1.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-monotonic_1.4.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-monotonic_1.4.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-msgpack.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-msgpack.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-msgpack.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-msgpack.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-msgpack_0.5.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-msgpack_0.5.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-msgpack_0.5.6.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-msgpack_0.5.6.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-ndg-httpsclient.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-ndg-httpsclient.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-ndg-httpsclient.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-ndg-httpsclient.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-ndg-httpsclient_0.4.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-ndg-httpsclient_0.4.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-ndg-httpsclient_0.4.4.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-ndg-httpsclient_0.4.4.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-netaddr.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-netaddr.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-netaddr.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-netaddr.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-netaddr_0.7.19.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-netaddr_0.7.19.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-netaddr_0.7.19.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-netaddr_0.7.19.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-networkx_2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-networkx_2.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-networkx_2.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-networkx_2.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-numeric/0001-it-tries-to-define-this-function-differently-than-it.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-numeric/0001-it-tries-to-define-this-function-differently-than-it.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-numeric/0001-it-tries-to-define-this-function-differently-than-it.patch
rename to meta-openembedded/meta-python/recipes-devtools/python/python-numeric/0001-it-tries-to-define-this-function-differently-than-it.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-numeric_24.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-numeric_24.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-numeric_24.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-numeric_24.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-oauthlib.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-oauthlib.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-oauthlib.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-oauthlib.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-oauthlib_2.0.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-oauthlib_2.0.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-oauthlib_2.0.6.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-oauthlib_2.0.6.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-paho-mqtt.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-paho-mqtt.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-paho-mqtt.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-paho-mqtt.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-paho-mqtt_1.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-paho-mqtt_1.3.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-paho-mqtt_1.3.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-paho-mqtt_1.3.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pam_1.8.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pam_1.8.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pam_1.8.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pam_1.8.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pandas.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pandas.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pandas.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pandas.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pandas_0.22.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pandas_0.22.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pandas_0.22.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pandas_0.22.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-parse-type_0.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-parse-type_0.4.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-parse-type_0.4.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-parse-type_0.4.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-parse_1.8.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-parse_1.8.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-parse_1.8.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-parse_1.8.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-passlib.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-passlib.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-passlib.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-passlib.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-passlib_1.7.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-passlib_1.7.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-passlib_1.7.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-passlib_1.7.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-paste_2.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-paste_2.0.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-paste_2.0.3.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-paste_2.0.3.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pbr_3.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pbr_3.1.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pbr_3.1.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pbr_3.1.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pep8_1.7.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pep8_1.7.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pep8_1.7.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pep8_1.7.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pexpect.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pexpect.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pexpect.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pexpect.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pexpect_4.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pexpect_4.5.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pexpect_4.5.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pexpect_4.5.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pip_9.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pip_9.0.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pip_9.0.3.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pip_9.0.3.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pluggy.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy_0.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy_0.6.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pluggy_0.6.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pluggy_0.6.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-ply.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-ply.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-ply.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-ply.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-ply_3.11.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-ply_3.11.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-ply_3.11.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-ply_3.11.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pretend.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pretend.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pretend.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pretend.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pretend_1.0.9.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pretend_1.0.9.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pretend_1.0.9.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pretend_1.0.9.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-prettytable_0.7.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-prettytable_0.7.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-prettytable_0.7.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-prettytable_0.7.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-progress.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-progress.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-progress.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-progress.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-progress_1.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-progress_1.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-progress_1.3.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-progress_1.3.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-prompt-toolkit.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-prompt-toolkit.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-prompt-toolkit.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-prompt-toolkit.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-prompt-toolkit_1.0.15.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-prompt-toolkit_1.0.15.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-prompt-toolkit_1.0.15.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-prompt-toolkit_1.0.15.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-protobuf.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-protobuf.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-protobuf.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-protobuf.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-protobuf_3.5.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-protobuf_3.5.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-protobuf_3.5.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-protobuf_3.5.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-psutil.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-psutil.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-psutil.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-psutil.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-psutil_5.4.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-psutil_5.4.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-psutil_5.4.3.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-psutil_5.4.3.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-ptyprocess.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-ptyprocess.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-ptyprocess.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-ptyprocess.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-ptyprocess_0.5.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-ptyprocess_0.5.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-ptyprocess_0.5.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-ptyprocess_0.5.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-py.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-py.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-py.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-py.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-py_1.5.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-py_1.5.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-py_1.5.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-py_1.5.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyalsaaudio.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyalsaaudio.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyalsaaudio.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyalsaaudio.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyalsaaudio_0.8.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyalsaaudio_0.8.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyalsaaudio_0.8.4.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyalsaaudio_0.8.4.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1-modules.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1-modules.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1-modules.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1-modules.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1-modules_0.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1-modules_0.2.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1-modules_0.2.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1-modules_0.2.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1_0.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1_0.4.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1_0.4.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyasn1_0.4.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pybind11.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pybind11.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pybind11.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pybind11.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pybind11_2.2.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pybind11_2.2.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pybind11_2.2.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pybind11_2.2.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pybluez.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pybluez.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pybluez.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pybluez.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pybluez_0.22.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pybluez_0.22.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pybluez_0.22.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pybluez_0.22.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pycparser.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pycparser.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pycparser.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pycparser.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pycparser_2.18.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pycparser_2.18.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pycparser_2.18.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pycparser_2.18.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pycrypto.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pycrypto.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pycrypto.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pycrypto.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pycrypto/CVE-2013-7459.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-pycrypto/CVE-2013-7459.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pycrypto/CVE-2013-7459.patch
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pycrypto/CVE-2013-7459.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pycrypto/cross-compiling.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-pycrypto/cross-compiling.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pycrypto/cross-compiling.patch
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pycrypto/cross-compiling.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pycrypto_2.6.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pycrypto_2.6.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pycrypto_2.6.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pycrypto_2.6.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pycryptodome.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pycryptodome.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pycryptodome.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pycryptodome.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pycryptodome_3.4.11.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pycryptodome_3.4.11.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pycryptodome_3.4.11.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pycryptodome_3.4.11.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pydbus.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pydbus.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pydbus.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pydbus.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pydbus_0.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pydbus_0.6.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pydbus_0.6.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pydbus_0.6.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyexpect.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyexpect.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyexpect.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyexpect.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyexpect_1.0.17.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyexpect_1.0.17.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyexpect_1.0.17.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyexpect_1.0.17.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyfirmata.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyfirmata.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyfirmata.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyfirmata.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyfirmata_1.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyfirmata_1.0.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyfirmata_1.0.3.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyfirmata_1.0.3.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyflakes_1.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyflakes_1.6.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyflakes_1.6.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyflakes_1.6.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pygpgme/0001-reflect-2.1-reporting-for-key-imports.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-pygpgme/0001-reflect-2.1-reporting-for-key-imports.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pygpgme/0001-reflect-2.1-reporting-for-key-imports.patch
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pygpgme/0001-reflect-2.1-reporting-for-key-imports.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pygpgme/0002-passphrase_cb-is-deprecated.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-pygpgme/0002-passphrase_cb-is-deprecated.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pygpgme/0002-passphrase_cb-is-deprecated.patch
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pygpgme/0002-passphrase_cb-is-deprecated.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pygpgme/0003-handle-generic-error-when-no-passphrase-callback-pre.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-pygpgme/0003-handle-generic-error-when-no-passphrase-callback-pre.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pygpgme/0003-handle-generic-error-when-no-passphrase-callback-pre.patch
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pygpgme/0003-handle-generic-error-when-no-passphrase-callback-pre.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pygpgme/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python-pygpgme/run-ptest
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pygpgme/run-ptest
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pygpgme/run-ptest
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pygpgme_0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pygpgme_0.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pygpgme_0.3.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pygpgme_0.3.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyhamcrest_1.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyhamcrest_1.9.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyhamcrest_1.9.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyhamcrest_1.9.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyiface.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyiface.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyiface.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyiface.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyiface_0.0.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyiface_0.0.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyiface_0.0.5.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyiface_0.0.5.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyinotify.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyinotify.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyinotify.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyinotify.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyinotify_0.9.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyinotify_0.9.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyinotify_0.9.6.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyinotify_0.9.6.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyjks.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyjks.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyjks.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyjks.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyjks_17.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyjks_17.1.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyjks_17.1.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyjks_17.1.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyjwt.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyjwt.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyjwt.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyjwt.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyjwt_1.6.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyjwt_1.6.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyjwt_1.6.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyjwt_1.6.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pylint.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pylint.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pylint.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pylint.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pylint_1.8.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pylint_1.8.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pylint_1.8.3.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pylint_1.8.3.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pymisp.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pymisp.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pymisp.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pymisp.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pymisp_2.4.89.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pymisp_2.4.89.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pymisp_2.4.89.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pymisp_2.4.89.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pymongo.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pymongo.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pymongo.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pymongo.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pymongo_3.6.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pymongo_3.6.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pymongo_3.6.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pymongo_3.6.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pynetlinux.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pynetlinux.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pynetlinux.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pynetlinux.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pynetlinux_1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pynetlinux_1.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pynetlinux_1.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pynetlinux_1.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyopenssl.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyopenssl.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyopenssl.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyopenssl.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyopenssl_17.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyopenssl_17.5.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyopenssl_17.5.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyopenssl_17.5.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyparsing.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyparsing.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyparsing.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyparsing.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyparsing_2.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyparsing_2.2.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyparsing_2.2.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyparsing_2.2.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyperclip.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyperclip.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyperclip.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyperclip.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyperclip_1.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyperclip_1.6.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyperclip_1.6.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyperclip_1.6.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyrex-native_0.9.9.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyrex-native_0.9.9.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyrex-native_0.9.9.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyrex-native_0.9.9.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyrex/pyrex-fix-optimized-mode.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-pyrex/pyrex-fix-optimized-mode.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyrex/pyrex-fix-optimized-mode.patch
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyrex/pyrex-fix-optimized-mode.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyrex_0.9.9.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyrex_0.9.9.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyrex_0.9.9.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyrex_0.9.9.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyroute2.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyroute2.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyroute2.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyroute2.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyroute2_0.4.21.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyroute2_0.4.21.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyroute2_0.4.21.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyroute2_0.4.21.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyserial.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyserial.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyserial.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyserial.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyserial_3.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyserial_3.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyserial_3.4.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyserial_3.4.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pysmi_0.2.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pysmi_0.2.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pysmi_0.2.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pysmi_0.2.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pysnmp_4.3.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pysnmp_4.3.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pysnmp_4.3.5.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pysnmp_4.3.5.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pysocks.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pysocks.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pysocks.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pysocks.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pysocks_1.6.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pysocks_1.6.8.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pysocks_1.6.8.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pysocks_1.6.8.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pysqlite.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pysqlite.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pysqlite.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pysqlite.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pysqlite_2.8.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pysqlite_2.8.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pysqlite_2.8.3.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pysqlite_2.8.3.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pystache.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pystache.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pystache.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pystache.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pystache_0.5.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pystache_0.5.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pystache_0.5.4.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pystache_0.5.4.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pytest-runner.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest-runner.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pytest-runner.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pytest-runner.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pytest-runner_3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest-runner_3.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pytest-runner_3.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pytest-runner_3.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pytest.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pytest/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pytest/pytest_version_fix.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest/pytest_version_fix.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pytest/pytest_version_fix.patch
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pytest/pytest_version_fix.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pytest_3.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pytest_3.4.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pytest_3.4.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pytest_3.4.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pytz.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pytz.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pytz.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pytz.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pytz_2018.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pytz_2018.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pytz_2018.4.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pytz_2018.4.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyudev.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyudev.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyudev.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyudev.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyudev_0.21.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyudev_0.21.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyudev_0.21.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyudev_0.21.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyusb.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyusb.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyusb.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyusb.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyusb_1.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyusb_1.0.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyusb_1.0.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyusb_1.0.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyyaml.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-pyyaml.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyyaml.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyyaml.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyyaml_3.12.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyyaml_3.12.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyyaml_3.12.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyyaml_3.12.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyzmq/club-rpath-out.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-pyzmq/club-rpath-out.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyzmq/club-rpath-out.patch
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyzmq/club-rpath-out.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyzmq_14.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-pyzmq_14.7.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-pyzmq_14.7.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-pyzmq_14.7.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-redis.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-redis.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-redis.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-redis.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-redis_2.10.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-redis_2.10.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-redis_2.10.6.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-redis_2.10.6.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-requests.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-requests.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-requests.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-requests.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-requests_2.18.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-requests_2.18.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-requests_2.18.4.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-requests_2.18.4.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-rfc3987.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-rfc3987.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-rfc3987.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-rfc3987.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-rfc3987_1.3.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-rfc3987_1.3.7.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-rfc3987_1.3.7.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-rfc3987_1.3.7.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-robotframework.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-robotframework.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-robotframework.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-robotframework.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-robotframework_3.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-robotframework_3.0.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-robotframework_3.0.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-robotframework_3.0.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-scrypt.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-scrypt.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-scrypt.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-scrypt.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-scrypt/0001-py-scrypt-remove-the-hard-coded-include-paths.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-scrypt/0001-py-scrypt-remove-the-hard-coded-include-paths.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-scrypt/0001-py-scrypt-remove-the-hard-coded-include-paths.patch
rename to meta-openembedded/meta-python/recipes-devtools/python/python-scrypt/0001-py-scrypt-remove-the-hard-coded-include-paths.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-scrypt_0.8.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-scrypt_0.8.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-scrypt_0.8.6.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-scrypt_0.8.6.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-sdnotify.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-sdnotify.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-sdnotify.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-sdnotify.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-sdnotify_0.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-sdnotify_0.3.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-sdnotify_0.3.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-sdnotify_0.3.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-selectors34_1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-selectors34_1.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-selectors34_1.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-selectors34_1.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-serpent.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-serpent.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-serpent.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-serpent.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-serpent_1.24.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-serpent_1.24.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-serpent_1.24.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-serpent_1.24.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-setuptools-scm.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-setuptools-scm.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-setuptools-scm.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-setuptools-scm.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-setuptools-scm_1.15.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-setuptools-scm_1.15.7.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-setuptools-scm_1.15.7.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-setuptools-scm_1.15.7.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-simplejson.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-simplejson.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-simplejson.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-simplejson.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-simplejson_3.13.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-simplejson_3.13.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-simplejson_3.13.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-simplejson_3.13.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-singledispatch_3.4.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-singledispatch_3.4.0.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-singledispatch_3.4.0.3.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-singledispatch_3.4.0.3.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-six.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-six.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-six.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-six.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-six_1.11.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-six_1.11.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-six_1.11.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-six_1.11.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-slip-dbus_0.6.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-slip-dbus_0.6.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-slip-dbus_0.6.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-slip-dbus_0.6.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-smbus.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-smbus.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-smbus.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-smbus.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-smbus_4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-smbus_4.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-smbus_4.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-smbus_4.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-snakefood_1.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-snakefood_1.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-snakefood_1.4.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-snakefood_1.4.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-snimpy_0.8.12.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-snimpy_0.8.12.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-snimpy_0.8.12.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-snimpy_0.8.12.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-sparts_0.7.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-sparts_0.7.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-sparts_0.7.3.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-sparts_0.7.3.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-speaklater.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-speaklater.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-speaklater.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-speaklater.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-speaklater_1.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-speaklater_1.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-speaklater_1.3.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-speaklater_1.3.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-spidev.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-spidev.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-spidev.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-spidev.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-sqlalchemy.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-sqlalchemy.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-sqlalchemy.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-sqlalchemy.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-sqlalchemy_1.1.17.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-sqlalchemy_1.1.17.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-sqlalchemy_1.1.17.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-sqlalchemy_1.1.17.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-strict-rfc3339.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-strict-rfc3339.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-strict-rfc3339.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-strict-rfc3339.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-strict-rfc3339_0.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-strict-rfc3339_0.7.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-strict-rfc3339_0.7.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-strict-rfc3339_0.7.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-subprocess32_3.2.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-subprocess32_3.2.7.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-subprocess32_3.2.7.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-subprocess32_3.2.7.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-systemd.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-systemd.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-systemd.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-systemd.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-systemd/0001-Provide-implementation-of-strndupa-for-musl.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-systemd/0001-Provide-implementation-of-strndupa-for-musl.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-systemd/0001-Provide-implementation-of-strndupa-for-musl.patch
rename to meta-openembedded/meta-python/recipes-devtools/python/python-systemd/0001-Provide-implementation-of-strndupa-for-musl.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-systemd_234.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-systemd_234.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-systemd_234.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-systemd_234.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-tornado-redis_2.4.18.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-tornado-redis_2.4.18.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-tornado-redis_2.4.18.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-tornado-redis_2.4.18.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-tornado.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-tornado.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-tornado.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-tornado.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-tornado_4.5.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-tornado_4.5.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-tornado_4.5.3.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-tornado_4.5.3.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-twisted.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-twisted.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-twisted.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-twisted.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-twisted_17.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-twisted_17.9.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-twisted_17.9.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-twisted_17.9.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-twofish.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-twofish.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-twofish.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-twofish.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-twofish_0.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-twofish_0.3.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-twofish_0.3.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-twofish_0.3.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-typing.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-typing.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-typing.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-typing.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-typing_3.6.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-typing_3.6.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-typing_3.6.4.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-typing_3.6.4.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-ujson.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-ujson.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-ujson.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-ujson.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-ujson_1.35.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-ujson_1.35.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-ujson_1.35.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-ujson_1.35.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-unidiff.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-unidiff.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-unidiff.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-unidiff.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-unidiff_0.5.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-unidiff_0.5.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-unidiff_0.5.5.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-unidiff_0.5.5.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-urllib3.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-urllib3.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-urllib3.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-urllib3.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-urllib3_1.22.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-urllib3_1.22.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-urllib3_1.22.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-urllib3_1.22.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-vcversioner_2.16.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-vcversioner_2.16.0.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-vcversioner_2.16.0.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-vcversioner_2.16.0.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-visitor.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-visitor.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-visitor.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-visitor.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-visitor_0.1.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-visitor_0.1.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-visitor_0.1.3.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-visitor_0.1.3.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-vobject_0.9.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-vobject_0.9.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-vobject_0.9.5.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-vobject_0.9.5.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-wcwidth.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-wcwidth.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-wcwidth.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-wcwidth.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-wcwidth_0.1.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-wcwidth_0.1.7.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-wcwidth_0.1.7.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-wcwidth_0.1.7.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-webcolors.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-webcolors.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-webcolors.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-webcolors.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-webcolors_1.8.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-webcolors_1.8.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-webcolors_1.8.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-webcolors_1.8.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-webdav_0.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-webdav_0.1.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-webdav_0.1.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-webdav_0.1.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-webencodings.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-webencodings.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-webencodings.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-webencodings.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-webencodings_0.5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-webencodings_0.5.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-webencodings_0.5.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-webencodings_0.5.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-werkzeug.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-werkzeug.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-werkzeug.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-werkzeug.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-werkzeug_0.14.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-werkzeug_0.14.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-werkzeug_0.14.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-werkzeug_0.14.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-whoosh.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-whoosh.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-whoosh.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-whoosh.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-whoosh_2.7.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-whoosh_2.7.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-whoosh_2.7.4.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-whoosh_2.7.4.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-wrapt.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-wrapt.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-wrapt.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-wrapt.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-wrapt_1.10.11.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-wrapt_1.10.11.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-wrapt_1.10.11.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-wrapt_1.10.11.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-wtforms.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-wtforms.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-wtforms.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-wtforms.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-wtforms_2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-wtforms_2.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-wtforms_2.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-wtforms_2.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-xlrd.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-xlrd.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-xlrd.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-xlrd.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-xlrd_1.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-xlrd_1.1.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-xlrd_1.1.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-xlrd_1.1.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-xstatic-font-awesome.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-xstatic-font-awesome.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-xstatic-font-awesome.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-xstatic-font-awesome.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-xstatic-font-awesome_4.7.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-xstatic-font-awesome_4.7.0.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-xstatic-font-awesome_4.7.0.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-xstatic-font-awesome_4.7.0.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-xstatic.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-xstatic.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-xstatic.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-xstatic.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-xstatic_1.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-xstatic_1.0.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-xstatic_1.0.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-xstatic_1.0.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-yappi.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-yappi.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-yappi.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-yappi.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-yappi_0.98.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-yappi_0.98.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-yappi_0.98.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-yappi_0.98.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-zopeinterface.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-zopeinterface.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-zopeinterface.inc
rename to meta-openembedded/meta-python/recipes-devtools/python/python-zopeinterface.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-zopeinterface_4.4.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python-zopeinterface_4.4.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-zopeinterface_4.4.3.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python-zopeinterface_4.4.3.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_0.9.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_0.9.8.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_0.9.8.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_0.9.8.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-anyjson_0.3.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-anyjson_0.3.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-anyjson_0.3.3.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-anyjson_0.3.3.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-appdirs_1.4.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-appdirs_1.4.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-appdirs_1.4.3.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-appdirs_1.4.3.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-asn1crypto_0.24.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-asn1crypto_0.24.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-asn1crypto_0.24.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-asn1crypto_0.24.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_1.6.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_1.6.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_1.6.3.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_1.6.3.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-attr_0.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-attr_0.3.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-attr_0.3.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-attr_0.3.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-attrs_17.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-attrs_17.4.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-attrs_17.4.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-attrs_17.4.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-automat_0.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-automat_0.6.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-automat_0.6.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-automat_0.6.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python_1.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python_1.3.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python_1.3.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python_1.3.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-babel_2.5.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-babel_2.5.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-babel_2.5.3.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-babel_2.5.3.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-bcrypt_3.1.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bcrypt_3.1.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-bcrypt_3.1.4.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-bcrypt_3.1.4.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.6.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.6.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.6.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_0.8.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_0.8.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_0.8.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_0.8.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-blinker_1.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-blinker_1.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-blinker_1.4.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-blinker_1.4.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-can_2.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-can_2.1.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-can_2.1.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-can_2.1.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-cassandra-driver_3.13.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cassandra-driver_3.13.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-cassandra-driver_3.13.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-cassandra-driver_3.13.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2018.1.18.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2018.1.18.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2018.1.18.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-certifi_2018.1.18.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-cffi_1.11.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cffi_1.11.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-cffi_1.11.5.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-cffi_1.11.5.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-chardet_3.0.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-chardet_3.0.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-chardet_3.0.4.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-chardet_3.0.4.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-click_6.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-click_6.7.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-click_6.7.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-click_6.7.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-configparser_3.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-configparser_3.5.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-configparser_3.5.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-configparser_3.5.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-constantly_15.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-constantly_15.1.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-constantly_15.1.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-constantly_15.1.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_4.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_4.4.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_4.4.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_4.4.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography-vectors_2.1.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography-vectors_2.1.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography-vectors_2.1.4.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography-vectors_2.1.4.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography/run-ptest
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography/run-ptest
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography/run-ptest
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_2.1.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_2.1.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_2.1.4.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography_2.1.4.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-cython_0.28.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cython_0.28.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-cython_0.28.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-cython_0.28.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-dateutil_2.7.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dateutil_2.7.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-dateutil_2.7.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-dateutil_2.7.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-decorator_4.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-decorator_4.3.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-decorator_4.3.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-decorator_4.3.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-django-south_1.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-django-south_1.0.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-django-south_1.0.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-django-south_1.0.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-django_1.11.10.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-django_1.11.10.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-django_1.11.10.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-django_1.11.10.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_1.15.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_1.15.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_1.15.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_1.15.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-dominate_2.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dominate_2.3.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-dominate_2.3.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-dominate_2.3.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-editor_1.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-editor_1.0.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-editor_1.0.3.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-editor_1.0.3.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_0.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_0.7.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_0.7.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_0.7.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-feedformatter_0.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-feedformatter_0.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-feedformatter_0.4.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-feedformatter_0.4.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_0.11.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_0.11.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_0.11.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_0.11.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-bootstrap_3.3.7.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-bootstrap_3.3.7.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-bootstrap_3.3.7.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-flask-bootstrap_3.3.7.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-login_0.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-login_0.4.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-login_0.4.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-flask-login_0.4.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-mail_0.9.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-mail_0.9.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-mail_0.9.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-flask-mail_0.9.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_2.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_2.1.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_2.1.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_2.1.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-nav_0.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-nav_0.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-nav_0.6.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-flask-nav_0.6.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-pymongo_0.5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-pymongo_0.5.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-pymongo_0.5.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-flask-pymongo_0.5.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-restful_0.3.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-restful_0.3.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-restful_0.3.6.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-flask-restful_0.3.6.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-script_2.0.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-script_2.0.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-script_2.0.6.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-flask-script_2.0.6.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-sqlalchemy_2.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-sqlalchemy_2.3.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-sqlalchemy_2.3.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-flask-sqlalchemy_2.3.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-uploads_0.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-uploads_0.2.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-uploads_0.2.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-flask-uploads_0.2.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-user_0.6.19.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-user_0.6.19.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-user_0.6.19.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-flask-user_0.6.19.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-wtf_0.14.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-wtf_0.14.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-wtf_0.14.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-flask-wtf_0.14.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-xstatic_0.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-xstatic_0.0.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-xstatic_0.0.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-flask-xstatic_0.0.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_0.12.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_0.12.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_0.12.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-flask_0.12.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-gevent_1.2.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-gevent_1.2.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-gevent_1.2.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-gevent_1.2.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-greenlet_0.4.13.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-greenlet_0.4.13.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-greenlet_0.4.13.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-greenlet_0.4.13.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-html5lib_1.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-html5lib_1.0.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-html5lib_1.0.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-html5lib_1.0.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_0.5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_0.5.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_0.5.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_0.5.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-hyperlink_17.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-hyperlink_17.3.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-hyperlink_17.3.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-hyperlink_17.3.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-idna_2.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-idna_2.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-idna_2.6.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-idna_2.6.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-incremental_17.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-incremental_17.5.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-incremental_17.5.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-incremental_17.5.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-iso8601_0.1.12.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-iso8601_0.1.12.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-iso8601_0.1.12.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-iso8601_0.1.12.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_4.3.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_4.3.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_4.3.4.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-isort_4.3.4.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-itsdangerous_0.24.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-itsdangerous_0.24.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-itsdangerous_0.24.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-itsdangerous_0.24.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.2.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.2.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.2.4.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-javaobj-py3_0.2.4.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-jinja2_2.10.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jinja2_2.10.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-jinja2_2.10.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-jinja2_2.10.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonpatch_1.23.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonpatch_1.23.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonpatch_1.23.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-jsonpatch_1.23.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonpointer_2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonpointer_2.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonpointer_2.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-jsonpointer_2.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonschema_2.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonschema_2.6.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonschema_2.6.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-jsonschema_2.6.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-langtable_0.0.38.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-langtable_0.0.38.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-langtable_0.0.38.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-langtable_0.0.38.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.3.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.3.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.3.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-lxml_4.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-lxml_4.2.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-lxml_4.2.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-lxml_4.2.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-markupsafe_1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-markupsafe_1.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-markupsafe_1.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-markupsafe_1.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_0.5.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_0.5.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_0.5.6.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_0.5.6.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-multidict_3.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-multidict_3.3.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-multidict_3.3.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-multidict_3.3.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-ndg-httpsclient_0.4.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ndg-httpsclient_0.4.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-ndg-httpsclient_0.4.4.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-ndg-httpsclient_0.4.4.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-netaddr_0.7.19.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-netaddr_0.7.19.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-netaddr_0.7.19.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-netaddr_0.7.19.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-ntplib_0.3.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ntplib_0.3.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-ntplib_0.3.3.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-ntplib_0.3.3.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-oauthlib_2.0.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-oauthlib_2.0.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-oauthlib_2.0.6.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-oauthlib_2.0.6.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-ordered-set_2.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ordered-set_2.0.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-ordered-set_2.0.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-ordered-set_2.0.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-paho-mqtt_1.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-paho-mqtt_1.3.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-paho-mqtt_1.3.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-paho-mqtt_1.3.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_0.22.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_0.22.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_0.22.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_0.22.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-passlib_1.7.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-passlib_1.7.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-passlib_1.7.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-passlib_1.7.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pexpect_4.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pexpect_4.5.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pexpect_4.5.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-pexpect_4.5.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pid/0001-remove-requirement-of-nose.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pid/0001-remove-requirement-of-nose.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pid/0001-remove-requirement-of-nose.patch
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-pid/0001-remove-requirement-of-nose.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pid_2.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pid_2.2.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pid_2.2.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-pid_2.2.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pluggy_0.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pluggy_0.6.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pluggy_0.6.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-pluggy_0.6.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-ply_3.11.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ply_3.11.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-ply_3.11.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-ply_3.11.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-prctl/0001-support-cross-complication.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-prctl/0001-support-cross-complication.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-prctl/0001-support-cross-complication.patch
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-prctl/0001-support-cross-complication.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-prctl_1.6.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-prctl_1.6.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-prctl_1.6.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-prctl_1.6.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pretend_1.0.9.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pretend_1.0.9.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pretend_1.0.9.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-pretend_1.0.9.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-progress_1.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-progress_1.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-progress_1.3.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-progress_1.3.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_1.0.15.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_1.0.15.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_1.0.15.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_1.0.15.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.5.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.5.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.5.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.5.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-psutil_5.4.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-psutil_5.4.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-psutil_5.4.3.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-psutil_5.4.3.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-ptyprocess_0.5.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ptyprocess_0.5.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-ptyprocess_0.5.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-ptyprocess_0.5.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-py_1.5.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-py_1.5.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-py_1.5.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-py_1.5.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyalsaaudio_0.8.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyalsaaudio_0.8.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyalsaaudio_0.8.4.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-pyalsaaudio_0.8.4.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.2.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.2.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.2.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1_0.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1_0.4.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1_0.4.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1_0.4.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.2.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.2.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.2.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.2.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pybluez_0.22.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybluez_0.22.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pybluez_0.22.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-pybluez_0.22.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pycparser_2.18.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pycparser_2.18.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pycparser_2.18.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-pycparser_2.18.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pycrypto_2.6.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pycrypto_2.6.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pycrypto_2.6.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-pycrypto_2.6.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pycryptodome_3.4.11.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pycryptodome_3.4.11.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pycryptodome_3.4.11.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-pycryptodome_3.4.11.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pydbus_0.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydbus_0.6.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pydbus_0.6.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-pydbus_0.6.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyexpect_1.0.17.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyexpect_1.0.17.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyexpect_1.0.17.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-pyexpect_1.0.17.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyfirmata_1.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyfirmata_1.0.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyfirmata_1.0.3.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-pyfirmata_1.0.3.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyiface_0.0.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyiface_0.0.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyiface_0.0.5.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-pyiface_0.0.5.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyinotify_0.9.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyinotify_0.9.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyinotify_0.9.6.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-pyinotify_0.9.6.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjks_17.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjks_17.1.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjks_17.1.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-pyjks_17.1.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjwt_1.6.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjwt_1.6.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjwt_1.6.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-pyjwt_1.6.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_1.8.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_1.8.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_1.8.3.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_1.8.3.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.89.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.89.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.89.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.89.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.6.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.6.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.6.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_3.6.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pynetlinux_1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pynetlinux_1.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pynetlinux_1.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-pynetlinux_1.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyopenssl_17.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyopenssl_17.5.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyopenssl_17.5.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-pyopenssl_17.5.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyparsing_2.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyparsing_2.2.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyparsing_2.2.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-pyparsing_2.2.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyperclip_1.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyperclip_1.6.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyperclip_1.6.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-pyperclip_1.6.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.4.21.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.4.21.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.4.21.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.4.21.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyserial_3.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyserial_3.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyserial_3.4.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-pyserial_3.4.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pysocks_1.6.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pysocks_1.6.8.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pysocks_1.6.8.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-pysocks_1.6.8.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-runner_3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-runner_3.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-runner_3.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-runner_3.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_3.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_3.4.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_3.4.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-pytest_3.4.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz_2018.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz_2018.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pytz_2018.4.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-pytz_2018.4.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyudev_0.21.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyudev_0.21.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyudev_0.21.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-pyudev_0.21.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyusb_1.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyusb_1.0.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyusb_1.0.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-pyusb_1.0.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyyaml_3.12.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyyaml_3.12.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-pyyaml_3.12.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-pyyaml_3.12.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_2.10.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_2.10.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_2.10.6.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-redis_2.10.6.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-file_1.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-file_1.4.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-file_1.4.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-requests-file_1.4.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-ftp_0.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-ftp_0.3.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-ftp_0.3.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-requests-ftp_0.3.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-requests_2.18.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests_2.18.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-requests_2.18.4.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-requests_2.18.4.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-rfc3987_1.3.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-rfc3987_1.3.7.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-rfc3987_1.3.7.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-rfc3987_1.3.7.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_3.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_3.0.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_3.0.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_3.0.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-scapy_0.23.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-scapy_0.23.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-scapy_0.23.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-scapy_0.23.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-scrypt_0.8.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-scrypt_0.8.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-scrypt_0.8.6.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-scrypt_0.8.6.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-sdnotify_0.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sdnotify_0.3.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-sdnotify_0.3.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-sdnotify_0.3.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-serpent_1.24.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-serpent_1.24.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-serpent_1.24.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-serpent_1.24.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-setuptools-scm_1.15.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-setuptools-scm_1.15.7.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-setuptools-scm_1.15.7.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-setuptools-scm_1.15.7.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-simplejson_3.13.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-simplejson_3.13.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-simplejson_3.13.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-simplejson_3.13.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus_4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus_4.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus_4.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-smbus_4.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-speaklater_1.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-speaklater_1.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-speaklater_1.3.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-speaklater_1.3.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-spidev_3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-spidev_3.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-spidev_3.2.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-spidev_3.2.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.1.17.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.1.17.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.1.17.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.1.17.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-strict-rfc3339_0.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-strict-rfc3339_0.7.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-strict-rfc3339_0.7.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-strict-rfc3339_0.7.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-systemd_234.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-systemd_234.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-systemd_234.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-systemd_234.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-tornado_4.5.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tornado_4.5.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-tornado_4.5.3.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-tornado_4.5.3.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_17.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_17.9.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_17.9.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_17.9.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-twofish_0.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-twofish_0.3.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-twofish_0.3.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-twofish_0.3.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_1.35.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_1.35.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_1.35.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_1.35.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-unidiff_0.5.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-unidiff_0.5.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-unidiff_0.5.5.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-unidiff_0.5.5.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.22.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.22.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.22.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.22.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-vcversioner_2.16.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-vcversioner_2.16.0.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-vcversioner_2.16.0.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-vcversioner_2.16.0.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-visitor_0.1.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-visitor_0.1.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-visitor_0.1.3.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-visitor_0.1.3.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-wcwidth_0.1.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-wcwidth_0.1.7.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-wcwidth_0.1.7.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-wcwidth_0.1.7.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-webcolors_1.8.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-webcolors_1.8.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-webcolors_1.8.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-webcolors_1.8.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-webencodings_0.5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-webencodings_0.5.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-webencodings_0.5.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-webencodings_0.5.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-websockets_4.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-websockets_4.0.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-websockets_4.0.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-websockets_4.0.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_0.14.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_0.14.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_0.14.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_0.14.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-whoosh_2.7.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-whoosh_2.7.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-whoosh_2.7.4.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-whoosh_2.7.4.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-wrapt_1.10.11.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-wrapt_1.10.11.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-wrapt_1.10.11.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-wrapt_1.10.11.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-wtforms_2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-wtforms_2.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-wtforms_2.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-wtforms_2.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-xlrd_1.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlrd_1.1.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-xlrd_1.1.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-xlrd_1.1.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-xstatic-font-awesome_4.7.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xstatic-font-awesome_4.7.0.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-xstatic-font-awesome_4.7.0.0.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-xstatic-font-awesome_4.7.0.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-xstatic_1.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xstatic_1.0.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-xstatic_1.0.1.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-xstatic_1.0.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-yappi_0.98.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-yappi_0.98.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-yappi_0.98.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-yappi_0.98.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-zopeinterface_4.4.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-zopeinterface_4.4.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-zopeinterface_4.4.3.bb
rename to meta-openembedded/meta-python/recipes-devtools/python/python3-zopeinterface_4.4.3.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0001-comment-out-selinux.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0001-comment-out-selinux.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0001-comment-out-selinux.patch
rename to meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0001-comment-out-selinux.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0002-run_program-support-timeout.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0002-run_program-support-timeout.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0002-run_program-support-timeout.patch
rename to meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0002-run_program-support-timeout.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0003-support-infinit-timeout.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0003-support-infinit-timeout.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0003-support-infinit-timeout.patch
rename to meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0003-support-infinit-timeout.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0004-Mount-var-volatile-during-install.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0004-Mount-var-volatile-during-install.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0004-Mount-var-volatile-during-install.patch
rename to meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0004-Mount-var-volatile-during-install.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0005-update-fstab-by-appending.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0005-update-fstab-by-appending.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0005-update-fstab-by-appending.patch
rename to meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0005-update-fstab-by-appending.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0006-fix-new.roots-object-is-not-iterable.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0006-fix-new.roots-object-is-not-iterable.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0006-fix-new.roots-object-is-not-iterable.patch
rename to meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0006-fix-new.roots-object-is-not-iterable.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0007-fix-incorrect-timeout-while-system-time-changed.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0007-fix-incorrect-timeout-while-system-time-changed.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0007-fix-incorrect-timeout-while-system-time-changed.patch
rename to meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0007-fix-incorrect-timeout-while-system-time-changed.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0008-tweak-btrfs-packages.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0008-tweak-btrfs-packages.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0008-tweak-btrfs-packages.patch
rename to meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0008-tweak-btrfs-packages.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0009-invoking-mount-with-infinite-timeout.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0009-invoking-mount-with-infinite-timeout.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0009-invoking-mount-with-infinite-timeout.patch
rename to meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0009-invoking-mount-with-infinite-timeout.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0010-use-oe-variable-to-replace-hardcoded-dir.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0010-use-oe-variable-to-replace-hardcoded-dir.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0010-use-oe-variable-to-replace-hardcoded-dir.patch
rename to meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0010-use-oe-variable-to-replace-hardcoded-dir.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0011-invoking-fsck-with-infinite-timeout.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0011-invoking-fsck-with-infinite-timeout.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0011-invoking-fsck-with-infinite-timeout.patch
rename to meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0011-invoking-fsck-with-infinite-timeout.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0012-invoking-mkfs-with-infinite-timeout.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0012-invoking-mkfs-with-infinite-timeout.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0012-invoking-mkfs-with-infinite-timeout.patch
rename to meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0012-invoking-mkfs-with-infinite-timeout.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0013-Revert-Adapt-to-logging-module-name-change.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0013-Revert-Adapt-to-logging-module-name-change.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0013-Revert-Adapt-to-logging-module-name-change.patch
rename to meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0013-Revert-Adapt-to-logging-module-name-change.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0014-invoking-dd-with-infinite-timeout.patch b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0014-invoking-dd-with-infinite-timeout.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0014-invoking-dd-with-infinite-timeout.patch
rename to meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet/0014-invoking-dd-with-infinite-timeout.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_2.2.0.bb b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_2.2.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_2.2.0.bb
rename to meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivet_2.2.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.5.bb b/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.5.bb
rename to meta-openembedded/meta-python/recipes-extended/python-blivet/python3-blivetgui_2.1.5.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-extended/python-cson/python-cson_git.bb b/meta-openembedded/meta-python/recipes-extended/python-cson/python-cson_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-extended/python-cson/python-cson_git.bb
rename to meta-openembedded/meta-python/recipes-extended/python-cson/python-cson_git.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh_0.46.bb b/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh_0.46.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh_0.46.bb
rename to meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh_0.46.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-extended/python-pyephem/python-pyephem_3.7.6.0.bb b/meta-openembedded/meta-python/recipes-extended/python-pyephem/python-pyephem_3.7.6.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-extended/python-pyephem/python-pyephem_3.7.6.0.bb
rename to meta-openembedded/meta-python/recipes-extended/python-pyephem/python-pyephem_3.7.6.0.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0001-support-authentication-for-kickstart.patch b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0001-support-authentication-for-kickstart.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0001-support-authentication-for-kickstart.patch
rename to meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0001-support-authentication-for-kickstart.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0002-pykickstart-parser.py-add-lock-for-readKickstart-and.patch b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0002-pykickstart-parser.py-add-lock-for-readKickstart-and.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0002-pykickstart-parser.py-add-lock-for-readKickstart-and.patch
rename to meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0002-pykickstart-parser.py-add-lock-for-readKickstart-and.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0003-comment-out-sections-shutdown-and-environment-in-gen.patch b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0003-comment-out-sections-shutdown-and-environment-in-gen.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0003-comment-out-sections-shutdown-and-environment-in-gen.patch
rename to meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0003-comment-out-sections-shutdown-and-environment-in-gen.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0004-load.py-retry-to-invoke-request-with-timeout.patch b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0004-load.py-retry-to-invoke-request-with-timeout.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0004-load.py-retry-to-invoke-request-with-timeout.patch
rename to meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0004-load.py-retry-to-invoke-request-with-timeout.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0005-tweak-shebang-to-python3.patch b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0005-tweak-shebang-to-python3.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0005-tweak-shebang-to-python3.patch
rename to meta-openembedded/meta-python/recipes-extended/python-pykickstart/files/0005-tweak-shebang-to-python3.patch
diff --git a/import-layers/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_2.35.bb b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_2.35.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_2.35.bb
rename to meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_2.35.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted.inc b/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted.inc
rename to meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted.inc
diff --git a/import-layers/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted_3.11.1.bb b/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted_3.11.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted_3.11.1.bb
rename to meta-openembedded/meta-python/recipes-extended/python-pyparted/python-pyparted_3.11.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.1.bb b/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.1.bb
rename to meta-openembedded/meta-python/recipes-extended/python-pyparted/python3-pyparted_3.11.1.bb
diff --git a/import-layers/meta-openembedded/meta-python/recipes-extended/pywbem/pywbem_0.8.0.bb b/meta-openembedded/meta-python/recipes-extended/pywbem/pywbem_0.8.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-python/recipes-extended/pywbem/pywbem_0.8.0.bb
rename to meta-openembedded/meta-python/recipes-extended/pywbem/pywbem_0.8.0.bb
diff --git a/import-layers/meta-openembedded/meta-webserver/COPYING.MIT b/meta-openembedded/meta-webserver/COPYING.MIT
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/COPYING.MIT
rename to meta-openembedded/meta-webserver/COPYING.MIT
diff --git a/import-layers/meta-openembedded/meta-webserver/README b/meta-openembedded/meta-webserver/README
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/README
rename to meta-openembedded/meta-webserver/README
diff --git a/import-layers/meta-openembedded/meta-webserver/conf/layer.conf b/meta-openembedded/meta-webserver/conf/layer.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/conf/layer.conf
rename to meta-openembedded/meta-webserver/conf/layer.conf
diff --git a/import-layers/meta-openembedded/meta-webserver/licenses/OML b/meta-openembedded/meta-webserver/licenses/OML
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/licenses/OML
rename to meta-openembedded/meta-webserver/licenses/OML
diff --git a/import-layers/meta-openembedded/meta-webserver/licenses/Xdebug b/meta-openembedded/meta-webserver/licenses/Xdebug
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/licenses/Xdebug
rename to meta-openembedded/meta-webserver/licenses/Xdebug
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb b/meta-openembedded/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb
rename to meta-openembedded/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.29.bb b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.29.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.29.bb
rename to meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.29.bb
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/apache-configure_perlbin.patch b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/apache-configure_perlbin.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/apache-configure_perlbin.patch
rename to meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/apache-configure_perlbin.patch
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/apache-ssl-ltmain-rpath.patch b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/apache-ssl-ltmain-rpath.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/apache-ssl-ltmain-rpath.patch
rename to meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/apache-ssl-ltmain-rpath.patch
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/httpd-2.4.1-corelimit.patch b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/httpd-2.4.1-corelimit.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/httpd-2.4.1-corelimit.patch
rename to meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/httpd-2.4.1-corelimit.patch
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/httpd-2.4.1-selinux.patch b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/httpd-2.4.1-selinux.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/httpd-2.4.1-selinux.patch
rename to meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/httpd-2.4.1-selinux.patch
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/httpd-2.4.4-export.patch b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/httpd-2.4.4-export.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/httpd-2.4.4-export.patch
rename to meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/httpd-2.4.4-export.patch
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/replace-lynx-to-curl-in-apachectl-script.patch b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/replace-lynx-to-curl-in-apachectl-script.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/replace-lynx-to-curl-in-apachectl-script.patch
rename to meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/replace-lynx-to-curl-in-apachectl-script.patch
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/server-makefile.patch b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/server-makefile.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/server-makefile.patch
rename to meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/server-makefile.patch
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.29.bb b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.29.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.29.bb
rename to meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.29.bb
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/0001-configure-use-pkg-config-for-PCRE-detection.patch b/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/0001-configure-use-pkg-config-for-PCRE-detection.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/0001-configure-use-pkg-config-for-PCRE-detection.patch
rename to meta-openembedded/meta-webserver/recipes-httpd/apache2/files/0001-configure-use-pkg-config-for-PCRE-detection.patch
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/apache2-volatile.conf b/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/apache2-volatile.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/apache2-volatile.conf
rename to meta-openembedded/meta-webserver/recipes-httpd/apache2/files/apache2-volatile.conf
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/apache2.service b/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/apache2.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/apache2.service
rename to meta-openembedded/meta-webserver/recipes-httpd/apache2/files/apache2.service
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/configure-allow-to-disable-selinux-support.patch b/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/configure-allow-to-disable-selinux-support.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/configure-allow-to-disable-selinux-support.patch
rename to meta-openembedded/meta-webserver/recipes-httpd/apache2/files/configure-allow-to-disable-selinux-support.patch
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/httpd-2.4.3-fix-race-issue-of-dir-install.patch b/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/httpd-2.4.3-fix-race-issue-of-dir-install.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/httpd-2.4.3-fix-race-issue-of-dir-install.patch
rename to meta-openembedded/meta-webserver/recipes-httpd/apache2/files/httpd-2.4.3-fix-race-issue-of-dir-install.patch
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/init b/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/init
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/init
rename to meta-openembedded/meta-webserver/recipes-httpd/apache2/files/init
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/volatiles.04_apache2 b/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/volatiles.04_apache2
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/files/volatiles.04_apache2
rename to meta-openembedded/meta-webserver/recipes-httpd/apache2/files/volatiles.04_apache2
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee/0001-configure.ac-Add-foreign-to-AM_INIT_AUTOMAKE.patch b/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee/0001-configure.ac-Add-foreign-to-AM_INIT_AUTOMAKE.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee/0001-configure.ac-Add-foreign-to-AM_INIT_AUTOMAKE.patch
rename to meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee/0001-configure.ac-Add-foreign-to-AM_INIT_AUTOMAKE.patch
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee/0001-make-Do-not-build-po-files.patch b/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee/0001-make-Do-not-build-po-files.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee/0001-make-Do-not-build-po-files.patch
rename to meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee/0001-make-Do-not-build-po-files.patch
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee-install-configured.py-once.patch b/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee-install-configured.py-once.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee-install-configured.py-once.patch
rename to meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee-install-configured.py-once.patch
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.init b/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.init
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.init
rename to meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.init
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.service b/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.service
rename to meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.service
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb b/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb
rename to meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/files/hiawatha-init b/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/files/hiawatha-init
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/files/hiawatha-init
rename to meta-openembedded/meta-webserver/recipes-httpd/hiawatha/files/hiawatha-init
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/files/hiawatha.service b/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/files/hiawatha.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/files/hiawatha.service
rename to meta-openembedded/meta-webserver/recipes-httpd/hiawatha/files/hiawatha.service
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.7.bb b/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.7.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.7.bb
rename to meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.7.bb
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/monkey/files/0001-configure-Respect-LIBS-variable-from-env.patch b/meta-openembedded/meta-webserver/recipes-httpd/monkey/files/0001-configure-Respect-LIBS-variable-from-env.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/monkey/files/0001-configure-Respect-LIBS-variable-from-env.patch
rename to meta-openembedded/meta-webserver/recipes-httpd/monkey/files/0001-configure-Respect-LIBS-variable-from-env.patch
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/monkey/files/monkey.init b/meta-openembedded/meta-webserver/recipes-httpd/monkey/files/monkey.init
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/monkey/files/monkey.init
rename to meta-openembedded/meta-webserver/recipes-httpd/monkey/files/monkey.init
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/monkey/files/monkey.service b/meta-openembedded/meta-webserver/recipes-httpd/monkey/files/monkey.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/monkey/files/monkey.service
rename to meta-openembedded/meta-webserver/recipes-httpd/monkey/files/monkey.service
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb b/meta-openembedded/meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb
rename to meta-openembedded/meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/0001-Allow-the-overriding-of-the-endianness-via-the-confi.patch b/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/0001-Allow-the-overriding-of-the-endianness-via-the-confi.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/0001-Allow-the-overriding-of-the-endianness-via-the-confi.patch
rename to meta-openembedded/meta-webserver/recipes-httpd/nginx/files/0001-Allow-the-overriding-of-the-endianness-via-the-confi.patch
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx-cross.patch b/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx-cross.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx-cross.patch
rename to meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx-cross.patch
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx-volatile.conf b/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx-volatile.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx-volatile.conf
rename to meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx-volatile.conf
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx.conf b/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx.conf
rename to meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx.conf
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx.init b/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx.init
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx.init
rename to meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx.init
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx.service b/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx.service
rename to meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx.service
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc
rename to meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.12.2.bb b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.12.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.12.2.bb
rename to meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.12.2.bb
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.13.9.bb b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.13.9.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.13.9.bb
rename to meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.13.9.bb
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/0001-GNUmakefile-add-possibility-to-override-variables.patch b/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/0001-GNUmakefile-add-possibility-to-override-variables.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/0001-GNUmakefile-add-possibility-to-override-variables.patch
rename to meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/0001-GNUmakefile-add-possibility-to-override-variables.patch
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/nhttpd.conf b/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/nhttpd.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/nhttpd.conf
rename to meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/nhttpd.conf
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/nostromo b/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/nostromo
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/nostromo
rename to meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/nostromo
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/tmpfiles.conf b/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/tmpfiles.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/tmpfiles.conf
rename to meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/tmpfiles.conf
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/volatiles b/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/volatiles
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/volatiles
rename to meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/volatiles
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.6.bb b/meta-openembedded/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.6.bb
rename to meta-openembedded/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.6.bb
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/sthttpd/sthttpd/init b/meta-openembedded/meta-webserver/recipes-httpd/sthttpd/sthttpd/init
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/sthttpd/sthttpd/init
rename to meta-openembedded/meta-webserver/recipes-httpd/sthttpd/sthttpd/init
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/sthttpd/sthttpd/thttpd.conf b/meta-openembedded/meta-webserver/recipes-httpd/sthttpd/sthttpd/thttpd.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/sthttpd/sthttpd/thttpd.conf
rename to meta-openembedded/meta-webserver/recipes-httpd/sthttpd/sthttpd/thttpd.conf
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/sthttpd/sthttpd/thttpd.service b/meta-openembedded/meta-webserver/recipes-httpd/sthttpd/sthttpd/thttpd.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/sthttpd/sthttpd/thttpd.service
rename to meta-openembedded/meta-webserver/recipes-httpd/sthttpd/sthttpd/thttpd.service
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb b/meta-openembedded/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb
rename to meta-openembedded/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin/apache.conf b/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin/apache.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin/apache.conf
rename to meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin/apache.conf
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.7.9.bb b/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.7.9.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.7.9.bb
rename to meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.7.9.bb
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-php/xdebug/xdebug_2.6.0.bb b/meta-openembedded/meta-webserver/recipes-php/xdebug/xdebug_2.6.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-php/xdebug/xdebug_2.6.0.bb
rename to meta-openembedded/meta-webserver/recipes-php/xdebug/xdebug_2.6.0.bb
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi/Fix_EOF_not_declared_issue.patch b/meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi/Fix_EOF_not_declared_issue.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi/Fix_EOF_not_declared_issue.patch
rename to meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi/Fix_EOF_not_declared_issue.patch
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi/add_foreign_to_AM_INIT_AUTOMAKE.patch b/meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi/add_foreign_to_AM_INIT_AUTOMAKE.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi/add_foreign_to_AM_INIT_AUTOMAKE.patch
rename to meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi/add_foreign_to_AM_INIT_AUTOMAKE.patch
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi_2.4.0.bb b/meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi_2.4.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi_2.4.0.bb
rename to meta-openembedded/meta-webserver/recipes-support/fcgi/fcgi_2.4.0.bb
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-support/spawn-fcgi/spawn-fcgi-1.6.4/fix_configure_ipv6_test.patch b/meta-openembedded/meta-webserver/recipes-support/spawn-fcgi/spawn-fcgi-1.6.4/fix_configure_ipv6_test.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-support/spawn-fcgi/spawn-fcgi-1.6.4/fix_configure_ipv6_test.patch
rename to meta-openembedded/meta-webserver/recipes-support/spawn-fcgi/spawn-fcgi-1.6.4/fix_configure_ipv6_test.patch
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-support/spawn-fcgi/spawn-fcgi_1.6.4.bb b/meta-openembedded/meta-webserver/recipes-support/spawn-fcgi/spawn-fcgi_1.6.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-support/spawn-fcgi/spawn-fcgi_1.6.4.bb
rename to meta-openembedded/meta-webserver/recipes-support/spawn-fcgi/spawn-fcgi_1.6.4.bb
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/0001-Correct-Timeout-issue.patch b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/0001-Correct-Timeout-issue.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/0001-Correct-Timeout-issue.patch
rename to meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/0001-Correct-Timeout-issue.patch
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/0001-makefile-Do-not-build-contrib-dir.patch b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/0001-makefile-Do-not-build-contrib-dir.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/0001-makefile-Do-not-build-contrib-dir.patch
rename to meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/0001-makefile-Do-not-build-contrib-dir.patch
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/netdata.conf b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/netdata.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/netdata.conf
rename to meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/netdata.conf
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/netdata.service b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/netdata.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/netdata.service
rename to meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/netdata.service
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb
rename to meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch
rename to meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/exports-lib.pl.patch b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/exports-lib.pl.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/exports-lib.pl.patch
rename to meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/exports-lib.pl.patch
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch
rename to meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/media-tomb.patch b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/media-tomb.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/media-tomb.patch
rename to meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/media-tomb.patch
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/mount-excludefs.patch b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/mount-excludefs.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/mount-excludefs.patch
rename to meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/mount-excludefs.patch
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/mysql-config-fix.patch b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/mysql-config-fix.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/mysql-config-fix.patch
rename to meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/mysql-config-fix.patch
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch
rename to meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/net-lib.pl.patch b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/net-lib.pl.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/net-lib.pl.patch
rename to meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/net-lib.pl.patch
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/nfs-export.patch b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/nfs-export.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/nfs-export.patch
rename to meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/nfs-export.patch
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/proftpd-config-fix.patch b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/proftpd-config-fix.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/proftpd-config-fix.patch
rename to meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/proftpd-config-fix.patch
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/remove-python2.3.patch b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/remove-python2.3.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/remove-python2.3.patch
rename to meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/remove-python2.3.patch
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/remove-startup-option.patch b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/remove-startup-option.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/remove-startup-option.patch
rename to meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/remove-startup-option.patch
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/samba-config-fix.patch b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/samba-config-fix.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/samba-config-fix.patch
rename to meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/samba-config-fix.patch
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/setup.sh b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/setup.sh
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/setup.sh
rename to meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/setup.sh
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/webmin.service b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/webmin.service
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/webmin.service
rename to meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/webmin.service
diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/webmin_1.850.bb b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/webmin_1.850.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/webmin_1.850.bb
rename to meta-openembedded/meta-webserver/recipes-webadmin/webmin/webmin_1.850.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/README b/meta-openembedded/meta-xfce/README
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/README
rename to meta-openembedded/meta-xfce/README
diff --git a/import-layers/meta-openembedded/meta-xfce/classes/thunar-plugin.bbclass b/meta-openembedded/meta-xfce/classes/thunar-plugin.bbclass
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/classes/thunar-plugin.bbclass
rename to meta-openembedded/meta-xfce/classes/thunar-plugin.bbclass
diff --git a/import-layers/meta-openembedded/meta-xfce/classes/xfce-app.bbclass b/meta-openembedded/meta-xfce/classes/xfce-app.bbclass
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/classes/xfce-app.bbclass
rename to meta-openembedded/meta-xfce/classes/xfce-app.bbclass
diff --git a/import-layers/meta-openembedded/meta-xfce/classes/xfce-git.bbclass b/meta-openembedded/meta-xfce/classes/xfce-git.bbclass
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/classes/xfce-git.bbclass
rename to meta-openembedded/meta-xfce/classes/xfce-git.bbclass
diff --git a/import-layers/meta-openembedded/meta-xfce/classes/xfce-panel-plugin.bbclass b/meta-openembedded/meta-xfce/classes/xfce-panel-plugin.bbclass
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/classes/xfce-panel-plugin.bbclass
rename to meta-openembedded/meta-xfce/classes/xfce-panel-plugin.bbclass
diff --git a/import-layers/meta-openembedded/meta-xfce/classes/xfce.bbclass b/meta-openembedded/meta-xfce/classes/xfce.bbclass
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/classes/xfce.bbclass
rename to meta-openembedded/meta-xfce/classes/xfce.bbclass
diff --git a/import-layers/meta-openembedded/meta-xfce/conf/layer.conf b/meta-openembedded/meta-xfce/conf/layer.conf
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/conf/layer.conf
rename to meta-openembedded/meta-xfce/conf/layer.conf
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-apps/gigolo/gigolo_0.4.2.bb b/meta-openembedded/meta-xfce/recipes-apps/gigolo/gigolo_0.4.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-apps/gigolo/gigolo_0.4.2.bb
rename to meta-openembedded/meta-xfce/recipes-apps/gigolo/gigolo_0.4.2.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.1.5.bb b/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.1.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.1.5.bb
rename to meta-openembedded/meta-xfce/recipes-apps/menulibre/menulibre_2.1.5.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.4.0.bb b/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.4.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.4.0.bb
rename to meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.4.0.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-apps/orage/orage_4.12.1.bb b/meta-openembedded/meta-xfce/recipes-apps/orage/orage_4.12.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-apps/orage/orage_4.12.1.bb
rename to meta-openembedded/meta-xfce/recipes-apps/orage/orage_4.12.1.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.8.2.bb b/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.8.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.8.2.bb
rename to meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.8.2.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb b/meta-openembedded/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb
rename to meta-openembedded/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/files/0001-fix-Name-Comment-fields.patch b/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/files/0001-fix-Name-Comment-fields.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/files/0001-fix-Name-Comment-fields.patch
rename to meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/files/0001-fix-Name-Comment-fields.patch
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.2.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.2.bb
rename to meta-openembedded/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.2.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb
rename to meta-openembedded/meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.4.2.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.4.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.4.2.bb
rename to meta-openembedded/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.4.2.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.1.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.1.bb
rename to meta-openembedded/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.1.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.2.0.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.2.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.2.0.bb
rename to meta-openembedded/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.2.0.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.7.3.bb b/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.7.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.7.3.bb
rename to meta-openembedded/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.7.3.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-art/cursor-themes/openzone_1.2.3.bb b/meta-openembedded/meta-xfce/recipes-art/cursor-themes/openzone_1.2.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-art/cursor-themes/openzone_1.2.3.bb
rename to meta-openembedded/meta-xfce/recipes-art/cursor-themes/openzone_1.2.3.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-art/rodent-icon-theme/rodent-icon-theme_5.0.bb b/meta-openembedded/meta-xfce/recipes-art/rodent-icon-theme/rodent-icon-theme_5.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-art/rodent-icon-theme/rodent-icon-theme_5.0.bb
rename to meta-openembedded/meta-xfce/recipes-art/rodent-icon-theme/rodent-icon-theme_5.0.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-art/xfce-dusk-gtk3/xfce-dusk-gtk3_1.3.bb b/meta-openembedded/meta-xfce/recipes-art/xfce-dusk-gtk3/xfce-dusk-gtk3_1.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-art/xfce-dusk-gtk3/xfce-dusk-gtk3_1.3.bb
rename to meta-openembedded/meta-xfce/recipes-art/xfce-dusk-gtk3/xfce-dusk-gtk3_1.3.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-art/xfwm4-themes/xfwm4-themes_4.10.0.bb b/meta-openembedded/meta-xfce/recipes-art/xfwm4-themes/xfwm4-themes_4.10.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-art/xfwm4-themes/xfwm4-themes_4.10.0.bb
rename to meta-openembedded/meta-xfce/recipes-art/xfwm4-themes/xfwm4-themes_4.10.0.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb b/meta-openembedded/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb
rename to meta-openembedded/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-core/images/core-image-minimal-xfce.bb b/meta-openembedded/meta-xfce/recipes-core/images/core-image-minimal-xfce.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-core/images/core-image-minimal-xfce.bb
rename to meta-openembedded/meta-xfce/recipes-core/images/core-image-minimal-xfce.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.7.3.bb b/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.7.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.7.3.bb
rename to meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.7.3.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch b/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch
rename to meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/0001-test-unique-Add-format-qualifier-s-for-string.patch b/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/0001-test-unique-Add-format-qualifier-s-for-string.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/0001-test-unique-Add-format-qualifier-s-for-string.patch
rename to meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/0001-test-unique-Add-format-qualifier-s-for-string.patch
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/build.patch b/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/build.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/build.patch
rename to meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/build.patch
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/fix_for_compile_with_gcc-4.6.0.patch b/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/fix_for_compile_with_gcc-4.6.0.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/fix_for_compile_with_gcc-4.6.0.patch
rename to meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/fix_for_compile_with_gcc-4.6.0.patch
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/noconst.patch b/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/noconst.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/noconst.patch
rename to meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/noconst.patch
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb b/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb
rename to meta-openembedded/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-multimedia/packagegroups/packagegroup-xfce-multimedia.bb b/meta-openembedded/meta-xfce/recipes-multimedia/packagegroups/packagegroup-xfce-multimedia.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-multimedia/packagegroups/packagegroup-xfce-multimedia.bb
rename to meta-openembedded/meta-xfce/recipes-multimedia/packagegroups/packagegroup-xfce-multimedia.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_1.0.0.bb b/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_1.0.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_1.0.0.bb
rename to meta-openembedded/meta-xfce/recipes-multimedia/parole/parole_1.0.0.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.0.bb b/meta-openembedded/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.0.bb
rename to meta-openembedded/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.0.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.2.3.bb b/meta-openembedded/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.2.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.2.3.bb
rename to meta-openembedded/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.2.3.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.0.bb
rename to meta-openembedded/meta-xfce/recipes-panel-plugins/battery/xfce4-battery-plugin_1.1.0.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/calculator/xfce4-calculator-plugin_0.6.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/calculator/xfce4-calculator-plugin_0.6.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/calculator/xfce4-calculator-plugin_0.6.0.bb
rename to meta-openembedded/meta-xfce/recipes-panel-plugins/calculator/xfce4-calculator-plugin_0.6.0.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.2.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.2.bb
rename to meta-openembedded/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.2.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb
rename to meta-openembedded/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.1.3.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.1.3.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.1.3.bb
rename to meta-openembedded/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.1.3.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.0.5.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.0.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.0.5.bb
rename to meta-openembedded/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.0.5.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.7.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.7.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.7.0.bb
rename to meta-openembedded/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.7.0.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.1.bb
rename to meta-openembedded/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.1.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/embed/xfce4-embed-plugin_1.0.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/embed/xfce4-embed-plugin_1.0.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/embed/xfce4-embed-plugin_1.0.0.bb
rename to meta-openembedded/meta-xfce/recipes-panel-plugins/embed/xfce4-embed-plugin_1.0.0.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/equake/xfce4-equake-plugin_1.3.8.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/equake/xfce4-equake-plugin_1.3.8.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/equake/xfce4-equake-plugin_1.3.8.1.bb
rename to meta-openembedded/meta-xfce/recipes-panel-plugins/equake/xfce4-equake-plugin_1.3.8.1.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.4.5.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.4.5.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.4.5.bb
rename to meta-openembedded/meta-xfce/recipes-panel-plugins/eyes/xfce4-eyes-plugin_4.4.5.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.1.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.1.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.1.0.bb
rename to meta-openembedded/meta-xfce/recipes-panel-plugins/fsguard/xfce4-fsguard-plugin_1.1.0.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_4.0.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_4.0.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_4.0.0.bb
rename to meta-openembedded/meta-xfce/recipes-panel-plugins/genmon/xfce4-genmon-plugin_4.0.0.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/hotcorner/xfce4-hotcorner-plugin_0.0.2.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/hotcorner/xfce4-hotcorner-plugin_0.0.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/hotcorner/xfce4-hotcorner-plugin_0.0.2.bb
rename to meta-openembedded/meta-xfce/recipes-panel-plugins/hotcorner/xfce4-hotcorner-plugin_0.0.2.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/kbdleds/xfce4-kbdleds-plugin_0.0.6.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/kbdleds/xfce4-kbdleds-plugin_0.0.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/kbdleds/xfce4-kbdleds-plugin_0.0.6.bb
rename to meta-openembedded/meta-xfce/recipes-panel-plugins/kbdleds/xfce4-kbdleds-plugin_0.0.6.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/mailwatch/xfce4-mailwatch-plugin_1.2.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/mailwatch/xfce4-mailwatch-plugin_1.2.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/mailwatch/xfce4-mailwatch-plugin_1.2.0.bb
rename to meta-openembedded/meta-xfce/recipes-panel-plugins/mailwatch/xfce4-mailwatch-plugin_1.2.0.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin/0001-check-for-fstab.h-during-configure.patch b/meta-openembedded/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin/0001-check-for-fstab.h-during-configure.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin/0001-check-for-fstab.h-during-configure.patch
rename to meta-openembedded/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin/0001-check-for-fstab.h-during-configure.patch
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_1.1.2.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_1.1.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_1.1.2.bb
rename to meta-openembedded/meta-xfce/recipes-panel-plugins/mount/xfce4-mount-plugin_1.1.2.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin/0001-Do-not-include-sys-sysctl.h-its-unused-on-linux-port.patch b/meta-openembedded/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin/0001-Do-not-include-sys-sysctl.h-its-unused-on-linux-port.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin/0001-Do-not-include-sys-sysctl.h-its-unused-on-linux-port.patch
rename to meta-openembedded/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin/0001-Do-not-include-sys-sysctl.h-its-unused-on-linux-port.patch
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.3.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.3.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.3.1.bb
rename to meta-openembedded/meta-xfce/recipes-panel-plugins/netload/xfce4-netload-plugin_1.3.1.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/notes/files/0001-main-status-icon.c-remove-deprecated-g_type_init.patch b/meta-openembedded/meta-xfce/recipes-panel-plugins/notes/files/0001-main-status-icon.c-remove-deprecated-g_type_init.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/notes/files/0001-main-status-icon.c-remove-deprecated-g_type_init.patch
rename to meta-openembedded/meta-xfce/recipes-panel-plugins/notes/files/0001-main-status-icon.c-remove-deprecated-g_type_init.patch
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/notes/files/01_fix_format-string.patch b/meta-openembedded/meta-xfce/recipes-panel-plugins/notes/files/01_fix_format-string.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/notes/files/01_fix_format-string.patch
rename to meta-openembedded/meta-xfce/recipes-panel-plugins/notes/files/01_fix_format-string.patch
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.8.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.8.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.8.1.bb
rename to meta-openembedded/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.8.1.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.7.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.7.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.7.0.bb
rename to meta-openembedded/meta-xfce/recipes-panel-plugins/places/xfce4-places-plugin_1.7.0.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.0.bb
rename to meta-openembedded/meta-xfce/recipes-panel-plugins/pulseaudio/xfce4-pulseaudio-plugin_0.4.0.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.2.97.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.2.97.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.2.97.bb
rename to meta-openembedded/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.2.97.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/smartbookmark/xfce4-smartbookmark-plugin_0.5.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/smartbookmark/xfce4-smartbookmark-plugin_0.5.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/smartbookmark/xfce4-smartbookmark-plugin_0.5.0.bb
rename to meta-openembedded/meta-xfce/recipes-panel-plugins/smartbookmark/xfce4-smartbookmark-plugin_0.5.0.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.2.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.2.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.2.1.bb
rename to meta-openembedded/meta-xfce/recipes-panel-plugins/systemload/xfce4-systemload-plugin_1.2.1.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.0.2.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.0.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.0.2.bb
rename to meta-openembedded/meta-xfce/recipes-panel-plugins/time-out/xfce4-time-out-plugin_1.0.2.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.7.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.7.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.7.0.bb
rename to meta-openembedded/meta-xfce/recipes-panel-plugins/timer/xfce4-timer-plugin_1.7.0.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/verve/xfce4-verve-plugin_1.1.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/verve/xfce4-verve-plugin_1.1.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/verve/xfce4-verve-plugin_1.1.0.bb
rename to meta-openembedded/meta-xfce/recipes-panel-plugins/verve/xfce4-verve-plugin_1.1.0.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.0.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.0.bb
rename to meta-openembedded/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.0.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.8.10.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.8.10.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.8.10.bb
rename to meta-openembedded/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.8.10.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.1.6.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.1.6.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.1.6.bb
rename to meta-openembedded/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.1.6.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.8.1.bb b/meta-openembedded/meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.8.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.8.1.bb
rename to meta-openembedded/meta-xfce/recipes-panel-plugins/xkb/xfce4-xkb-plugin_0.8.1.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-support/vim/vim_%.bbappend b/meta-openembedded/meta-xfce/recipes-support/vim/vim_%.bbappend
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-support/vim/vim_%.bbappend
rename to meta-openembedded/meta-xfce/recipes-support/vim/vim_%.bbappend
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-support/vim/vim_xfce.inc b/meta-openembedded/meta-xfce/recipes-support/vim/vim_xfce.inc
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-support/vim/vim_xfce.inc
rename to meta-openembedded/meta-xfce/recipes-support/vim/vim_xfce.inc
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-thunar-plugins/archive/thunar-archive-plugin_0.3.1.bb b/meta-openembedded/meta-xfce/recipes-thunar-plugins/archive/thunar-archive-plugin_0.3.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-thunar-plugins/archive/thunar-archive-plugin_0.3.1.bb
rename to meta-openembedded/meta-xfce/recipes-thunar-plugins/archive/thunar-archive-plugin_0.3.1.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-thunar-plugins/media-tags/thunar-media-tags-plugin_0.2.1.bb b/meta-openembedded/meta-xfce/recipes-thunar-plugins/media-tags/thunar-media-tags-plugin_0.2.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-thunar-plugins/media-tags/thunar-media-tags-plugin_0.2.1.bb
rename to meta-openembedded/meta-xfce/recipes-thunar-plugins/media-tags/thunar-media-tags-plugin_0.2.1.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/configure.patch b/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/configure.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/configure.patch
rename to meta-openembedded/meta-xfce/recipes-xfce/exo/exo/configure.patch
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch b/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch
rename to meta-openembedded/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch b/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch
rename to meta-openembedded/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.12.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.12.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.12.0.bb
rename to meta-openembedded/meta-xfce/recipes-xfce/exo/exo_0.12.0.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/garcon/files/0001-xfce-applications.menu-don-t-bloat-settings-menu-by-.patch b/meta-openembedded/meta-xfce/recipes-xfce/garcon/files/0001-xfce-applications.menu-don-t-bloat-settings-menu-by-.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-xfce/garcon/files/0001-xfce-applications.menu-don-t-bloat-settings-menu-by-.patch
rename to meta-openembedded/meta-xfce/recipes-xfce/garcon/files/0001-xfce-applications.menu-don-t-bloat-settings-menu-by-.patch
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_0.6.1.bb b/meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_0.6.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_0.6.1.bb
rename to meta-openembedded/meta-xfce/recipes-xfce/garcon/garcon_0.6.1.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine/glib-2.54-ftbfs.patch b/meta-openembedded/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine/glib-2.54-ftbfs.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine/glib-2.54-ftbfs.patch
rename to meta-openembedded/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine/glib-2.54-ftbfs.patch
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.2.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.2.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.2.0.bb
rename to meta-openembedded/meta-xfce/recipes-xfce/gtk-xfce-engine/gtk-xfce-engine_3.2.0.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch
rename to meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/files/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.12.1.bb b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.12.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.12.1.bb
rename to meta-openembedded/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.12.1.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.12.1.bb b/meta-openembedded/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.12.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.12.1.bb
rename to meta-openembedded/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.12.1.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb b/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb
rename to meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb b/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
rename to meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman/0001-Fix-return-with-no-value-in-function-returning-non-v.patch b/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman/0001-Fix-return-with-no-value-in-function-returning-non-v.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman/0001-Fix-return-with-no-value-in-function-returning-non-v.patch
rename to meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman/0001-Fix-return-with-no-value-in-function-returning-non-v.patch
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.8.1.bb b/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.8.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.8.1.bb
rename to meta-openembedded/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_0.8.1.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_1.6.15.bb b/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_1.6.15.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_1.6.15.bb
rename to meta-openembedded/meta-xfce/recipes-xfce/thunar/thunar_1.6.15.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler/0001-configure-use-pkg-config-for-freetype2.patch b/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler/0001-configure-use-pkg-config-for-freetype2.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler/0001-configure-use-pkg-config-for-freetype2.patch
rename to meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler/0001-configure-use-pkg-config-for-freetype2.patch
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.2.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.2.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.2.0.bb
rename to meta-openembedded/meta-xfce/recipes-xfce/tumbler/tumbler_0.2.0.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.13.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.13.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.13.0.bb
rename to meta-openembedded/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.13.0.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.12.0.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.12.0.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.12.0.bb
rename to meta-openembedded/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.12.0.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0001-clock-time-make-change-of-system-s-timezone-change-t.patch b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0001-clock-time-make-change-of-system-s-timezone-change-t.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0001-clock-time-make-change-of-system-s-timezone-change-t.patch
rename to meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0001-clock-time-make-change-of-system-s-timezone-change-t.patch
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0002-windowmenu-do-not-display-desktop-icon-when-no-windo.patch b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0002-windowmenu-do-not-display-desktop-icon-when-no-windo.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0002-windowmenu-do-not-display-desktop-icon-when-no-windo.patch
rename to meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0002-windowmenu-do-not-display-desktop-icon-when-no-windo.patch
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.12.2.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.12.2.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.12.2.bb
rename to meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.12.2.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.1.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.1.bb
rename to meta-openembedded/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.1.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/machine-host.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/machine-host.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/machine-host.bb
rename to meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/machine-host.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-configure.in-hard-code-path-to-iceauth.patch b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-configure.in-hard-code-path-to-iceauth.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-configure.in-hard-code-path-to-iceauth.patch
rename to meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session/0001-configure.in-hard-code-path-to-iceauth.patch
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.12.1.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.12.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.12.1.bb
rename to meta-openembedded/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.12.1.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/files/0001-xsettings.xml-Set-default-themes.patch b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/files/0001-xsettings.xml-Set-default-themes.patch
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/files/0001-xsettings.xml-Set-default-themes.patch
rename to meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/files/0001-xsettings.xml-Set-default-themes.patch
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
rename to meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.12.1.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.12.1.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.12.1.bb
rename to meta-openembedded/meta-xfce/recipes-xfce/xfconf/xfconf_4.12.1.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.12.4.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.12.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.12.4.bb
rename to meta-openembedded/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.12.4.bb
diff --git a/import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.12.4.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.12.4.bb
similarity index 100%
rename from import-layers/meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.12.4.bb
rename to meta-openembedded/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.12.4.bb
diff --git a/meta-phosphor/conf/bblayers.conf.sample b/meta-phosphor/conf/bblayers.conf.sample
index 1fbaa52..7d9607d 100644
--- a/meta-phosphor/conf/bblayers.conf.sample
+++ b/meta-phosphor/conf/bblayers.conf.sample
@@ -8,17 +8,17 @@
 BBLAYERS ?= " \
   ##OEROOT##/meta \
   ##OEROOT##/meta-poky \
-  ##OEROOT##/import-layers/meta-openembedded/meta-oe \
-  ##OEROOT##/import-layers/meta-openembedded/meta-networking \
-  ##OEROOT##/import-layers/meta-openembedded/meta-python \
-  ##OEROOT##/import-layers/meta-openembedded/meta-webserver \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-phosphor \
   "
 BBLAYERS_NON_REMOVABLE ?= " \
   ##OEROOT##/meta \
   ##OEROOT##/meta-poky \
-  ##OEROOT##/import-layers/meta-openembedded/meta-oe \
-  ##OEROOT##/import-layers/meta-openembedded/meta-networking \
-  ##OEROOT##/import-layers/meta-openembedded/meta-python \
-  ##OEROOT##/import-layers/meta-openembedded/meta-webserver \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/meta-openembedded/meta-webserver \
   "
diff --git a/meta-poky b/meta-poky
index 671ab38..65b9a73 120000
--- a/meta-poky
+++ b/meta-poky
@@ -1 +1 @@
-import-layers/yocto-poky/meta-poky
\ No newline at end of file
+poky/meta-poky/
\ No newline at end of file
diff --git a/import-layers/meta-raspberrypi/.github/ISSUE_TEMPLATE.md b/meta-raspberrypi/.github/ISSUE_TEMPLATE.md
similarity index 100%
rename from import-layers/meta-raspberrypi/.github/ISSUE_TEMPLATE.md
rename to meta-raspberrypi/.github/ISSUE_TEMPLATE.md
diff --git a/import-layers/meta-raspberrypi/.github/PULL_REQUEST_TEMPLATE.md b/meta-raspberrypi/.github/PULL_REQUEST_TEMPLATE.md
similarity index 100%
rename from import-layers/meta-raspberrypi/.github/PULL_REQUEST_TEMPLATE.md
rename to meta-raspberrypi/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/import-layers/meta-raspberrypi/.gitignore b/meta-raspberrypi/.gitignore
similarity index 100%
rename from import-layers/meta-raspberrypi/.gitignore
rename to meta-raspberrypi/.gitignore
diff --git a/import-layers/meta-raspberrypi/COPYING.MIT b/meta-raspberrypi/COPYING.MIT
similarity index 100%
rename from import-layers/meta-raspberrypi/COPYING.MIT
rename to meta-raspberrypi/COPYING.MIT
diff --git a/import-layers/meta-raspberrypi/README.md b/meta-raspberrypi/README.md
similarity index 100%
rename from import-layers/meta-raspberrypi/README.md
rename to meta-raspberrypi/README.md
diff --git a/import-layers/meta-raspberrypi/classes/sdcard_image-rpi.bbclass b/meta-raspberrypi/classes/sdcard_image-rpi.bbclass
similarity index 100%
rename from import-layers/meta-raspberrypi/classes/sdcard_image-rpi.bbclass
rename to meta-raspberrypi/classes/sdcard_image-rpi.bbclass
diff --git a/import-layers/meta-raspberrypi/conf/layer.conf b/meta-raspberrypi/conf/layer.conf
similarity index 100%
rename from import-layers/meta-raspberrypi/conf/layer.conf
rename to meta-raspberrypi/conf/layer.conf
diff --git a/import-layers/meta-raspberrypi/conf/machine/include/rpi-base.inc b/meta-raspberrypi/conf/machine/include/rpi-base.inc
similarity index 100%
rename from import-layers/meta-raspberrypi/conf/machine/include/rpi-base.inc
rename to meta-raspberrypi/conf/machine/include/rpi-base.inc
diff --git a/import-layers/meta-raspberrypi/conf/machine/include/rpi-default-providers.inc b/meta-raspberrypi/conf/machine/include/rpi-default-providers.inc
similarity index 100%
rename from import-layers/meta-raspberrypi/conf/machine/include/rpi-default-providers.inc
rename to meta-raspberrypi/conf/machine/include/rpi-default-providers.inc
diff --git a/import-layers/meta-raspberrypi/conf/machine/include/rpi-default-settings.inc b/meta-raspberrypi/conf/machine/include/rpi-default-settings.inc
similarity index 100%
rename from import-layers/meta-raspberrypi/conf/machine/include/rpi-default-settings.inc
rename to meta-raspberrypi/conf/machine/include/rpi-default-settings.inc
diff --git a/import-layers/meta-raspberrypi/conf/machine/include/rpi-default-versions.inc b/meta-raspberrypi/conf/machine/include/rpi-default-versions.inc
similarity index 100%
rename from import-layers/meta-raspberrypi/conf/machine/include/rpi-default-versions.inc
rename to meta-raspberrypi/conf/machine/include/rpi-default-versions.inc
diff --git a/import-layers/meta-raspberrypi/conf/machine/include/tune-arm1176jzf-s.inc b/meta-raspberrypi/conf/machine/include/tune-arm1176jzf-s.inc
similarity index 100%
rename from import-layers/meta-raspberrypi/conf/machine/include/tune-arm1176jzf-s.inc
rename to meta-raspberrypi/conf/machine/include/tune-arm1176jzf-s.inc
diff --git a/import-layers/meta-raspberrypi/conf/machine/raspberrypi-cm.conf b/meta-raspberrypi/conf/machine/raspberrypi-cm.conf
similarity index 100%
rename from import-layers/meta-raspberrypi/conf/machine/raspberrypi-cm.conf
rename to meta-raspberrypi/conf/machine/raspberrypi-cm.conf
diff --git a/import-layers/meta-raspberrypi/conf/machine/raspberrypi-cm3.conf b/meta-raspberrypi/conf/machine/raspberrypi-cm3.conf
similarity index 100%
rename from import-layers/meta-raspberrypi/conf/machine/raspberrypi-cm3.conf
rename to meta-raspberrypi/conf/machine/raspberrypi-cm3.conf
diff --git a/import-layers/meta-raspberrypi/conf/machine/raspberrypi.conf b/meta-raspberrypi/conf/machine/raspberrypi.conf
similarity index 100%
rename from import-layers/meta-raspberrypi/conf/machine/raspberrypi.conf
rename to meta-raspberrypi/conf/machine/raspberrypi.conf
diff --git a/import-layers/meta-raspberrypi/conf/machine/raspberrypi0-wifi.conf b/meta-raspberrypi/conf/machine/raspberrypi0-wifi.conf
similarity index 100%
rename from import-layers/meta-raspberrypi/conf/machine/raspberrypi0-wifi.conf
rename to meta-raspberrypi/conf/machine/raspberrypi0-wifi.conf
diff --git a/import-layers/meta-raspberrypi/conf/machine/raspberrypi0.conf b/meta-raspberrypi/conf/machine/raspberrypi0.conf
similarity index 100%
rename from import-layers/meta-raspberrypi/conf/machine/raspberrypi0.conf
rename to meta-raspberrypi/conf/machine/raspberrypi0.conf
diff --git a/import-layers/meta-raspberrypi/conf/machine/raspberrypi2.conf b/meta-raspberrypi/conf/machine/raspberrypi2.conf
similarity index 100%
rename from import-layers/meta-raspberrypi/conf/machine/raspberrypi2.conf
rename to meta-raspberrypi/conf/machine/raspberrypi2.conf
diff --git a/import-layers/meta-raspberrypi/conf/machine/raspberrypi3-64.conf b/meta-raspberrypi/conf/machine/raspberrypi3-64.conf
similarity index 100%
rename from import-layers/meta-raspberrypi/conf/machine/raspberrypi3-64.conf
rename to meta-raspberrypi/conf/machine/raspberrypi3-64.conf
diff --git a/import-layers/meta-raspberrypi/conf/machine/raspberrypi3.conf b/meta-raspberrypi/conf/machine/raspberrypi3.conf
similarity index 100%
rename from import-layers/meta-raspberrypi/conf/machine/raspberrypi3.conf
rename to meta-raspberrypi/conf/machine/raspberrypi3.conf
diff --git a/import-layers/meta-raspberrypi/docs/Makefile b/meta-raspberrypi/docs/Makefile
similarity index 100%
rename from import-layers/meta-raspberrypi/docs/Makefile
rename to meta-raspberrypi/docs/Makefile
diff --git a/import-layers/meta-raspberrypi/docs/conf.py b/meta-raspberrypi/docs/conf.py
similarity index 100%
rename from import-layers/meta-raspberrypi/docs/conf.py
rename to meta-raspberrypi/docs/conf.py
diff --git a/import-layers/meta-raspberrypi/docs/contributing.md b/meta-raspberrypi/docs/contributing.md
similarity index 100%
rename from import-layers/meta-raspberrypi/docs/contributing.md
rename to meta-raspberrypi/docs/contributing.md
diff --git a/import-layers/meta-raspberrypi/docs/extra-apps.md b/meta-raspberrypi/docs/extra-apps.md
similarity index 100%
rename from import-layers/meta-raspberrypi/docs/extra-apps.md
rename to meta-raspberrypi/docs/extra-apps.md
diff --git a/import-layers/meta-raspberrypi/docs/extra-build-config.md b/meta-raspberrypi/docs/extra-build-config.md
similarity index 100%
rename from import-layers/meta-raspberrypi/docs/extra-build-config.md
rename to meta-raspberrypi/docs/extra-build-config.md
diff --git a/import-layers/meta-raspberrypi/docs/index.rst b/meta-raspberrypi/docs/index.rst
similarity index 100%
rename from import-layers/meta-raspberrypi/docs/index.rst
rename to meta-raspberrypi/docs/index.rst
diff --git a/import-layers/meta-raspberrypi/docs/layer-contents.md b/meta-raspberrypi/docs/layer-contents.md
similarity index 100%
rename from import-layers/meta-raspberrypi/docs/layer-contents.md
rename to meta-raspberrypi/docs/layer-contents.md
diff --git a/import-layers/meta-raspberrypi/docs/readme.md b/meta-raspberrypi/docs/readme.md
similarity index 100%
rename from import-layers/meta-raspberrypi/docs/readme.md
rename to meta-raspberrypi/docs/readme.md
diff --git a/import-layers/meta-raspberrypi/files/custom-licenses/Broadcom b/meta-raspberrypi/files/custom-licenses/Broadcom
similarity index 100%
rename from import-layers/meta-raspberrypi/files/custom-licenses/Broadcom
rename to meta-raspberrypi/files/custom-licenses/Broadcom
diff --git a/import-layers/meta-raspberrypi/recipes-bsp/bootfiles/bcm2835-bootfiles.bb b/meta-raspberrypi/recipes-bsp/bootfiles/bcm2835-bootfiles.bb
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-bsp/bootfiles/bcm2835-bootfiles.bb
rename to meta-raspberrypi/recipes-bsp/bootfiles/bcm2835-bootfiles.bb
diff --git a/import-layers/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bb b/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bb
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bb
rename to meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bb
diff --git a/import-layers/meta-raspberrypi/recipes-bsp/common/firmware.inc b/meta-raspberrypi/recipes-bsp/common/firmware.inc
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-bsp/common/firmware.inc
rename to meta-raspberrypi/recipes-bsp/common/firmware.inc
diff --git a/import-layers/meta-raspberrypi/recipes-bsp/formfactor/formfactor/raspberrypi/machconfig b/meta-raspberrypi/recipes-bsp/formfactor/formfactor/raspberrypi/machconfig
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-bsp/formfactor/formfactor/raspberrypi/machconfig
rename to meta-raspberrypi/recipes-bsp/formfactor/formfactor/raspberrypi/machconfig
diff --git a/import-layers/meta-raspberrypi/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-raspberrypi/recipes-bsp/formfactor/formfactor_0.0.bbappend
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-bsp/formfactor/formfactor_0.0.bbappend
rename to meta-raspberrypi/recipes-bsp/formfactor/formfactor_0.0.bbappend
diff --git a/import-layers/meta-raspberrypi/recipes-bsp/rpi-u-boot-scr/files/boot.cmd.in b/meta-raspberrypi/recipes-bsp/rpi-u-boot-scr/files/boot.cmd.in
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-bsp/rpi-u-boot-scr/files/boot.cmd.in
rename to meta-raspberrypi/recipes-bsp/rpi-u-boot-scr/files/boot.cmd.in
diff --git a/import-layers/meta-raspberrypi/recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bb b/meta-raspberrypi/recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bb
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bb
rename to meta-raspberrypi/recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bb
diff --git a/import-layers/meta-raspberrypi/recipes-bsp/u-boot/u-boot/0002-rpi_0_w-Add-configs-consistent-with-RpI3.patch b/meta-raspberrypi/recipes-bsp/u-boot/u-boot/0002-rpi_0_w-Add-configs-consistent-with-RpI3.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-bsp/u-boot/u-boot/0002-rpi_0_w-Add-configs-consistent-with-RpI3.patch
rename to meta-raspberrypi/recipes-bsp/u-boot/u-boot/0002-rpi_0_w-Add-configs-consistent-with-RpI3.patch
diff --git a/import-layers/meta-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend
rename to meta-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend
diff --git a/import-layers/meta-raspberrypi/recipes-connectivity/bluez5/bluez5/0001-bcm43xx-Add-bcm43xx-3wire-variant.patch b/meta-raspberrypi/recipes-connectivity/bluez5/bluez5/0001-bcm43xx-Add-bcm43xx-3wire-variant.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-connectivity/bluez5/bluez5/0001-bcm43xx-Add-bcm43xx-3wire-variant.patch
rename to meta-raspberrypi/recipes-connectivity/bluez5/bluez5/0001-bcm43xx-Add-bcm43xx-3wire-variant.patch
diff --git a/import-layers/meta-raspberrypi/recipes-connectivity/bluez5/bluez5/0002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch b/meta-raspberrypi/recipes-connectivity/bluez5/bluez5/0002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-connectivity/bluez5/bluez5/0002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch
rename to meta-raspberrypi/recipes-connectivity/bluez5/bluez5/0002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch
diff --git a/import-layers/meta-raspberrypi/recipes-connectivity/bluez5/bluez5/0003-Increase-firmware-load-timeout-to-30s.patch b/meta-raspberrypi/recipes-connectivity/bluez5/bluez5/0003-Increase-firmware-load-timeout-to-30s.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-connectivity/bluez5/bluez5/0003-Increase-firmware-load-timeout-to-30s.patch
rename to meta-raspberrypi/recipes-connectivity/bluez5/bluez5/0003-Increase-firmware-load-timeout-to-30s.patch
diff --git a/import-layers/meta-raspberrypi/recipes-connectivity/bluez5/bluez5/0004-Move-the-43xx-firmware-into-lib-firmware.patch b/meta-raspberrypi/recipes-connectivity/bluez5/bluez5/0004-Move-the-43xx-firmware-into-lib-firmware.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-connectivity/bluez5/bluez5/0004-Move-the-43xx-firmware-into-lib-firmware.patch
rename to meta-raspberrypi/recipes-connectivity/bluez5/bluez5/0004-Move-the-43xx-firmware-into-lib-firmware.patch
diff --git a/import-layers/meta-raspberrypi/recipes-connectivity/bluez5/bluez5/brcm43438.service b/meta-raspberrypi/recipes-connectivity/bluez5/bluez5/brcm43438.service
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-connectivity/bluez5/bluez5/brcm43438.service
rename to meta-raspberrypi/recipes-connectivity/bluez5/bluez5/brcm43438.service
diff --git a/import-layers/meta-raspberrypi/recipes-connectivity/bluez5/bluez5_%.bbappend b/meta-raspberrypi/recipes-connectivity/bluez5/bluez5_%.bbappend
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-connectivity/bluez5/bluez5_%.bbappend
rename to meta-raspberrypi/recipes-connectivity/bluez5/bluez5_%.bbappend
diff --git a/import-layers/meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth.bb b/meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth.bb
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth.bb
rename to meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth.bb
diff --git a/import-layers/meta-raspberrypi/recipes-core/images/rpi-basic-image.bb b/meta-raspberrypi/recipes-core/images/rpi-basic-image.bb
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-core/images/rpi-basic-image.bb
rename to meta-raspberrypi/recipes-core/images/rpi-basic-image.bb
diff --git a/import-layers/meta-raspberrypi/recipes-core/images/rpi-hwup-image.bb b/meta-raspberrypi/recipes-core/images/rpi-hwup-image.bb
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-core/images/rpi-hwup-image.bb
rename to meta-raspberrypi/recipes-core/images/rpi-hwup-image.bb
diff --git a/import-layers/meta-raspberrypi/recipes-core/images/rpi-test-image.bb b/meta-raspberrypi/recipes-core/images/rpi-test-image.bb
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-core/images/rpi-test-image.bb
rename to meta-raspberrypi/recipes-core/images/rpi-test-image.bb
diff --git a/import-layers/meta-raspberrypi/recipes-core/packagegroups/packagegroup-rpi-test.bb b/meta-raspberrypi/recipes-core/packagegroups/packagegroup-rpi-test.bb
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-core/packagegroups/packagegroup-rpi-test.bb
rename to meta-raspberrypi/recipes-core/packagegroups/packagegroup-rpi-test.bb
diff --git a/import-layers/meta-raspberrypi/recipes-core/psplash/files/psplash-raspberrypi-img.h b/meta-raspberrypi/recipes-core/psplash/files/psplash-raspberrypi-img.h
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-core/psplash/files/psplash-raspberrypi-img.h
rename to meta-raspberrypi/recipes-core/psplash/files/psplash-raspberrypi-img.h
diff --git a/import-layers/meta-raspberrypi/recipes-core/psplash/psplash_git.bbappend b/meta-raspberrypi/recipes-core/psplash/psplash_git.bbappend
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-core/psplash/psplash_git.bbappend
rename to meta-raspberrypi/recipes-core/psplash/psplash_git.bbappend
diff --git a/import-layers/meta-raspberrypi/recipes-core/udev/udev-rules-rpi.bb b/meta-raspberrypi/recipes-core/udev/udev-rules-rpi.bb
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-core/udev/udev-rules-rpi.bb
rename to meta-raspberrypi/recipes-core/udev/udev-rules-rpi.bb
diff --git a/import-layers/meta-raspberrypi/recipes-core/udev/udev-rules-rpi/99-com.rules b/meta-raspberrypi/recipes-core/udev/udev-rules-rpi/99-com.rules
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-core/udev/udev-rules-rpi/99-com.rules
rename to meta-raspberrypi/recipes-core/udev/udev-rules-rpi/99-com.rules
diff --git a/import-layers/meta-raspberrypi/recipes-core/udev/udev-rules-udisks-rpi/80-udisks-rpi.rules b/meta-raspberrypi/recipes-core/udev/udev-rules-udisks-rpi/80-udisks-rpi.rules
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-core/udev/udev-rules-udisks-rpi/80-udisks-rpi.rules
rename to meta-raspberrypi/recipes-core/udev/udev-rules-udisks-rpi/80-udisks-rpi.rules
diff --git a/import-layers/meta-raspberrypi/recipes-core/udev/udev-rules-udisks-rpi_1.0.bb b/meta-raspberrypi/recipes-core/udev/udev-rules-udisks-rpi_1.0.bb
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-core/udev/udev-rules-udisks-rpi_1.0.bb
rename to meta-raspberrypi/recipes-core/udev/udev-rules-udisks-rpi_1.0.bb
diff --git a/import-layers/meta-raspberrypi/recipes-devtools/bcm2835/bcm2835_1.52.bb b/meta-raspberrypi/recipes-devtools/bcm2835/bcm2835_1.52.bb
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-devtools/bcm2835/bcm2835_1.52.bb
rename to meta-raspberrypi/recipes-devtools/bcm2835/bcm2835_1.52.bb
diff --git a/import-layers/meta-raspberrypi/recipes-devtools/pi-blaster/files/remove-initscript-lsb-dependency.patch b/meta-raspberrypi/recipes-devtools/pi-blaster/files/remove-initscript-lsb-dependency.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-devtools/pi-blaster/files/remove-initscript-lsb-dependency.patch
rename to meta-raspberrypi/recipes-devtools/pi-blaster/files/remove-initscript-lsb-dependency.patch
diff --git a/import-layers/meta-raspberrypi/recipes-devtools/pi-blaster/pi-blaster_git.bb b/meta-raspberrypi/recipes-devtools/pi-blaster/pi-blaster_git.bb
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-devtools/pi-blaster/pi-blaster_git.bb
rename to meta-raspberrypi/recipes-devtools/pi-blaster/pi-blaster_git.bb
diff --git a/import-layers/meta-raspberrypi/recipes-devtools/python/python-rtimu/0001-include-asm-ioctl.h-for-ioctl-define.patch b/meta-raspberrypi/recipes-devtools/python/python-rtimu/0001-include-asm-ioctl.h-for-ioctl-define.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-devtools/python/python-rtimu/0001-include-asm-ioctl.h-for-ioctl-define.patch
rename to meta-raspberrypi/recipes-devtools/python/python-rtimu/0001-include-asm-ioctl.h-for-ioctl-define.patch
diff --git a/import-layers/meta-raspberrypi/recipes-devtools/python/python-rtimu_git.bb b/meta-raspberrypi/recipes-devtools/python/python-rtimu_git.bb
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-devtools/python/python-rtimu_git.bb
rename to meta-raspberrypi/recipes-devtools/python/python-rtimu_git.bb
diff --git a/import-layers/meta-raspberrypi/recipes-devtools/python/python-sense-hat_2.2.0.bb b/meta-raspberrypi/recipes-devtools/python/python-sense-hat_2.2.0.bb
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-devtools/python/python-sense-hat_2.2.0.bb
rename to meta-raspberrypi/recipes-devtools/python/python-sense-hat_2.2.0.bb
diff --git a/import-layers/meta-raspberrypi/recipes-devtools/python/rpi-gpio/0001-Remove-nested-functions.patch b/meta-raspberrypi/recipes-devtools/python/rpi-gpio/0001-Remove-nested-functions.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-devtools/python/rpi-gpio/0001-Remove-nested-functions.patch
rename to meta-raspberrypi/recipes-devtools/python/rpi-gpio/0001-Remove-nested-functions.patch
diff --git a/import-layers/meta-raspberrypi/recipes-devtools/python/rpi-gpio_0.6.3.bb b/meta-raspberrypi/recipes-devtools/python/rpi-gpio_0.6.3.bb
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-devtools/python/rpi-gpio_0.6.3.bb
rename to meta-raspberrypi/recipes-devtools/python/rpi-gpio_0.6.3.bb
diff --git a/import-layers/meta-raspberrypi/recipes-devtools/python/rpio/0001-include-sys-types.h-explicitly-for-getting-caddr_t-d.patch b/meta-raspberrypi/recipes-devtools/python/rpio/0001-include-sys-types.h-explicitly-for-getting-caddr_t-d.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-devtools/python/rpio/0001-include-sys-types.h-explicitly-for-getting-caddr_t-d.patch
rename to meta-raspberrypi/recipes-devtools/python/rpio/0001-include-sys-types.h-explicitly-for-getting-caddr_t-d.patch
diff --git a/import-layers/meta-raspberrypi/recipes-devtools/python/rpio_0.10.0.bb b/meta-raspberrypi/recipes-devtools/python/rpio_0.10.0.bb
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-devtools/python/rpio_0.10.0.bb
rename to meta-raspberrypi/recipes-devtools/python/rpio_0.10.0.bb
diff --git a/import-layers/meta-raspberrypi/recipes-devtools/wiringPi/files/0001-Add-initial-cross-compile-support.patch b/meta-raspberrypi/recipes-devtools/wiringPi/files/0001-Add-initial-cross-compile-support.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-devtools/wiringPi/files/0001-Add-initial-cross-compile-support.patch
rename to meta-raspberrypi/recipes-devtools/wiringPi/files/0001-Add-initial-cross-compile-support.patch
diff --git a/import-layers/meta-raspberrypi/recipes-devtools/wiringPi/wiringpi_git.bb b/meta-raspberrypi/recipes-devtools/wiringPi/wiringpi_git.bb
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-devtools/wiringPi/wiringpi_git.bb
rename to meta-raspberrypi/recipes-devtools/wiringPi/wiringpi_git.bb
diff --git a/import-layers/meta-raspberrypi/recipes-graphics/eglinfo/eglinfo-fb_%.bbappend b/meta-raspberrypi/recipes-graphics/eglinfo/eglinfo-fb_%.bbappend
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-graphics/eglinfo/eglinfo-fb_%.bbappend
rename to meta-raspberrypi/recipes-graphics/eglinfo/eglinfo-fb_%.bbappend
diff --git a/import-layers/meta-raspberrypi/recipes-graphics/eglinfo/eglinfo-x11_%.bbappend b/meta-raspberrypi/recipes-graphics/eglinfo/eglinfo-x11_%.bbappend
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-graphics/eglinfo/eglinfo-x11_%.bbappend
rename to meta-raspberrypi/recipes-graphics/eglinfo/eglinfo-x11_%.bbappend
diff --git a/import-layers/meta-raspberrypi/recipes-graphics/mesa/mesa-gl_%.bbappend b/meta-raspberrypi/recipes-graphics/mesa/mesa-gl_%.bbappend
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-graphics/mesa/mesa-gl_%.bbappend
rename to meta-raspberrypi/recipes-graphics/mesa/mesa-gl_%.bbappend
diff --git a/import-layers/meta-raspberrypi/recipes-graphics/mesa/mesa_%.bbappend b/meta-raspberrypi/recipes-graphics/mesa/mesa_%.bbappend
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-graphics/mesa/mesa_%.bbappend
rename to meta-raspberrypi/recipes-graphics/mesa/mesa_%.bbappend
diff --git a/import-layers/meta-raspberrypi/recipes-graphics/userland/userland/0001-Allow-applications-to-set-next-resource-handle.patch b/meta-raspberrypi/recipes-graphics/userland/userland/0001-Allow-applications-to-set-next-resource-handle.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-graphics/userland/userland/0001-Allow-applications-to-set-next-resource-handle.patch
rename to meta-raspberrypi/recipes-graphics/userland/userland/0001-Allow-applications-to-set-next-resource-handle.patch
diff --git a/import-layers/meta-raspberrypi/recipes-graphics/userland/userland/0002-wayland-Add-support-for-the-Wayland-winsys.patch b/meta-raspberrypi/recipes-graphics/userland/userland/0002-wayland-Add-support-for-the-Wayland-winsys.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-graphics/userland/userland/0002-wayland-Add-support-for-the-Wayland-winsys.patch
rename to meta-raspberrypi/recipes-graphics/userland/userland/0002-wayland-Add-support-for-the-Wayland-winsys.patch
diff --git a/import-layers/meta-raspberrypi/recipes-graphics/userland/userland/0003-wayland-Add-Wayland-example.patch b/meta-raspberrypi/recipes-graphics/userland/userland/0003-wayland-Add-Wayland-example.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-graphics/userland/userland/0003-wayland-Add-Wayland-example.patch
rename to meta-raspberrypi/recipes-graphics/userland/userland/0003-wayland-Add-Wayland-example.patch
Binary files differ
diff --git a/import-layers/meta-raspberrypi/recipes-graphics/userland/userland/0004-wayland-egl-Add-bcm_host-to-dependencies.patch b/meta-raspberrypi/recipes-graphics/userland/userland/0004-wayland-egl-Add-bcm_host-to-dependencies.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-graphics/userland/userland/0004-wayland-egl-Add-bcm_host-to-dependencies.patch
rename to meta-raspberrypi/recipes-graphics/userland/userland/0004-wayland-egl-Add-bcm_host-to-dependencies.patch
diff --git a/import-layers/meta-raspberrypi/recipes-graphics/userland/userland/0005-interface-remove-faulty-assert-to-make-weston-happy-.patch b/meta-raspberrypi/recipes-graphics/userland/userland/0005-interface-remove-faulty-assert-to-make-weston-happy-.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-graphics/userland/userland/0005-interface-remove-faulty-assert-to-make-weston-happy-.patch
rename to meta-raspberrypi/recipes-graphics/userland/userland/0005-interface-remove-faulty-assert-to-make-weston-happy-.patch
diff --git a/import-layers/meta-raspberrypi/recipes-graphics/userland/userland/0006-zero-out-wl-buffers-in-egl_surface_free.patch b/meta-raspberrypi/recipes-graphics/userland/userland/0006-zero-out-wl-buffers-in-egl_surface_free.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-graphics/userland/userland/0006-zero-out-wl-buffers-in-egl_surface_free.patch
rename to meta-raspberrypi/recipes-graphics/userland/userland/0006-zero-out-wl-buffers-in-egl_surface_free.patch
diff --git a/import-layers/meta-raspberrypi/recipes-graphics/userland/userland/0007-initialize-front-back-wayland-buffers.patch b/meta-raspberrypi/recipes-graphics/userland/userland/0007-initialize-front-back-wayland-buffers.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-graphics/userland/userland/0007-initialize-front-back-wayland-buffers.patch
rename to meta-raspberrypi/recipes-graphics/userland/userland/0007-initialize-front-back-wayland-buffers.patch
diff --git a/import-layers/meta-raspberrypi/recipes-graphics/userland/userland/0008-Remove-RPC_FLUSH.patch b/meta-raspberrypi/recipes-graphics/userland/userland/0008-Remove-RPC_FLUSH.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-graphics/userland/userland/0008-Remove-RPC_FLUSH.patch
rename to meta-raspberrypi/recipes-graphics/userland/userland/0008-Remove-RPC_FLUSH.patch
diff --git a/import-layers/meta-raspberrypi/recipes-graphics/userland/userland/0009-fix-cmake-dependency-race.patch b/meta-raspberrypi/recipes-graphics/userland/userland/0009-fix-cmake-dependency-race.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-graphics/userland/userland/0009-fix-cmake-dependency-race.patch
rename to meta-raspberrypi/recipes-graphics/userland/userland/0009-fix-cmake-dependency-race.patch
diff --git a/import-layers/meta-raspberrypi/recipes-graphics/userland/userland/0010-Fix-for-framerate-with-nested-composition.patch b/meta-raspberrypi/recipes-graphics/userland/userland/0010-Fix-for-framerate-with-nested-composition.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-graphics/userland/userland/0010-Fix-for-framerate-with-nested-composition.patch
rename to meta-raspberrypi/recipes-graphics/userland/userland/0010-Fix-for-framerate-with-nested-composition.patch
diff --git a/import-layers/meta-raspberrypi/recipes-graphics/userland/userland/0011-build-shared-library-for-vchostif.patch b/meta-raspberrypi/recipes-graphics/userland/userland/0011-build-shared-library-for-vchostif.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-graphics/userland/userland/0011-build-shared-library-for-vchostif.patch
rename to meta-raspberrypi/recipes-graphics/userland/userland/0011-build-shared-library-for-vchostif.patch
diff --git a/import-layers/meta-raspberrypi/recipes-graphics/userland/userland/0012-implement-buffer-wrapping-interface-for-dispmanx.patch b/meta-raspberrypi/recipes-graphics/userland/userland/0012-implement-buffer-wrapping-interface-for-dispmanx.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-graphics/userland/userland/0012-implement-buffer-wrapping-interface-for-dispmanx.patch
rename to meta-raspberrypi/recipes-graphics/userland/userland/0012-implement-buffer-wrapping-interface-for-dispmanx.patch
diff --git a/import-layers/meta-raspberrypi/recipes-graphics/userland/userland/0013-Implement-triple-buffering-for-wayland.patch b/meta-raspberrypi/recipes-graphics/userland/userland/0013-Implement-triple-buffering-for-wayland.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-graphics/userland/userland/0013-Implement-triple-buffering-for-wayland.patch
rename to meta-raspberrypi/recipes-graphics/userland/userland/0013-Implement-triple-buffering-for-wayland.patch
diff --git a/import-layers/meta-raspberrypi/recipes-graphics/userland/userland/0014-GLES2-gl2ext.h-Define-GL_R8_EXT-and-GL_RG8_EXT.patch b/meta-raspberrypi/recipes-graphics/userland/userland/0014-GLES2-gl2ext.h-Define-GL_R8_EXT-and-GL_RG8_EXT.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-graphics/userland/userland/0014-GLES2-gl2ext.h-Define-GL_R8_EXT-and-GL_RG8_EXT.patch
rename to meta-raspberrypi/recipes-graphics/userland/userland/0014-GLES2-gl2ext.h-Define-GL_R8_EXT-and-GL_RG8_EXT.patch
diff --git a/import-layers/meta-raspberrypi/recipes-graphics/userland/userland/0015-EGL-glplatform.h-define-EGL_CAST.patch b/meta-raspberrypi/recipes-graphics/userland/userland/0015-EGL-glplatform.h-define-EGL_CAST.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-graphics/userland/userland/0015-EGL-glplatform.h-define-EGL_CAST.patch
rename to meta-raspberrypi/recipes-graphics/userland/userland/0015-EGL-glplatform.h-define-EGL_CAST.patch
diff --git a/import-layers/meta-raspberrypi/recipes-graphics/userland/userland/0016-Allow-multiple-wayland-compositor-state-data-per-pro.patch b/meta-raspberrypi/recipes-graphics/userland/userland/0016-Allow-multiple-wayland-compositor-state-data-per-pro.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-graphics/userland/userland/0016-Allow-multiple-wayland-compositor-state-data-per-pro.patch
rename to meta-raspberrypi/recipes-graphics/userland/userland/0016-Allow-multiple-wayland-compositor-state-data-per-pro.patch
diff --git a/import-layers/meta-raspberrypi/recipes-graphics/userland/userland_git.bb b/meta-raspberrypi/recipes-graphics/userland/userland_git.bb
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-graphics/userland/userland_git.bb
rename to meta-raspberrypi/recipes-graphics/userland/userland_git.bb
diff --git a/import-layers/meta-raspberrypi/recipes-graphics/vc-graphics/files/egl.pc b/meta-raspberrypi/recipes-graphics/vc-graphics/files/egl.pc
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-graphics/vc-graphics/files/egl.pc
rename to meta-raspberrypi/recipes-graphics/vc-graphics/files/egl.pc
diff --git a/import-layers/meta-raspberrypi/recipes-graphics/vc-graphics/files/vchiq.sh b/meta-raspberrypi/recipes-graphics/vc-graphics/files/vchiq.sh
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-graphics/vc-graphics/files/vchiq.sh
rename to meta-raspberrypi/recipes-graphics/vc-graphics/files/vchiq.sh
diff --git a/import-layers/meta-raspberrypi/recipes-graphics/vc-graphics/vc-graphics-hardfp.bb b/meta-raspberrypi/recipes-graphics/vc-graphics/vc-graphics-hardfp.bb
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-graphics/vc-graphics/vc-graphics-hardfp.bb
rename to meta-raspberrypi/recipes-graphics/vc-graphics/vc-graphics-hardfp.bb
diff --git a/import-layers/meta-raspberrypi/recipes-graphics/vc-graphics/vc-graphics.bb b/meta-raspberrypi/recipes-graphics/vc-graphics/vc-graphics.bb
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-graphics/vc-graphics/vc-graphics.bb
rename to meta-raspberrypi/recipes-graphics/vc-graphics/vc-graphics.bb
diff --git a/import-layers/meta-raspberrypi/recipes-graphics/vc-graphics/vc-graphics.inc b/meta-raspberrypi/recipes-graphics/vc-graphics/vc-graphics.inc
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-graphics/vc-graphics/vc-graphics.inc
rename to meta-raspberrypi/recipes-graphics/vc-graphics/vc-graphics.inc
diff --git a/import-layers/meta-raspberrypi/recipes-graphics/wayland/weston_%.bbappend b/meta-raspberrypi/recipes-graphics/wayland/weston_%.bbappend
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-graphics/wayland/weston_%.bbappend
rename to meta-raspberrypi/recipes-graphics/wayland/weston_%.bbappend
diff --git a/import-layers/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf b/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf
rename to meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf
diff --git a/import-layers/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/10-noglamor.conf b/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/10-noglamor.conf
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/10-noglamor.conf
rename to meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/10-noglamor.conf
diff --git a/import-layers/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/98-pitft.conf b/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/98-pitft.conf
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/98-pitft.conf
rename to meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/98-pitft.conf
diff --git a/import-layers/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-calibration.conf b/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-calibration.conf
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-calibration.conf
rename to meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xf86-config/rpi/xorg.conf.d/99-calibration.conf
diff --git a/import-layers/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
rename to meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
diff --git a/import-layers/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend b/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
rename to meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
diff --git a/import-layers/meta-raspberrypi/recipes-kernel/linux-firmware/linux-firmware_%.bbappend b/meta-raspberrypi/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
rename to meta-raspberrypi/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
diff --git a/import-layers/meta-raspberrypi/recipes-kernel/linux/files/0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch b/meta-raspberrypi/recipes-kernel/linux/files/0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-kernel/linux/files/0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch
rename to meta-raspberrypi/recipes-kernel/linux/files/0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch
diff --git a/import-layers/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-dev.bb b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-dev.bb
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-dev.bb
rename to meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi-dev.bb
diff --git a/import-layers/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc
rename to meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc
diff --git a/import-layers/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.14.bb b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.14.bb
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.14.bb
rename to meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.14.bb
diff --git a/import-layers/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.9.bb b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.9.bb
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.9.bb
rename to meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.9.bb
diff --git a/import-layers/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.12/0001-Don-t-try-to-acquire-buffer-when-src-pad-isn-t-activ.patch b/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.12/0001-Don-t-try-to-acquire-buffer-when-src-pad-isn-t-activ.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.12/0001-Don-t-try-to-acquire-buffer-when-src-pad-isn-t-activ.patch
rename to meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.12/0001-Don-t-try-to-acquire-buffer-when-src-pad-isn-t-activ.patch
diff --git a/import-layers/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.12/0001-config-files-path.patch b/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.12/0001-config-files-path.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.12/0001-config-files-path.patch
rename to meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.12/0001-config-files-path.patch
diff --git a/import-layers/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.12/0002-fix-decoder-flushing.patch b/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.12/0002-fix-decoder-flushing.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.12/0002-fix-decoder-flushing.patch
rename to meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.12/0002-fix-decoder-flushing.patch
diff --git a/import-layers/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.12/0003-no-timeout-on-get-state.patch b/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.12/0003-no-timeout-on-get-state.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.12/0003-no-timeout-on-get-state.patch
rename to meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.12/0003-no-timeout-on-get-state.patch
diff --git a/import-layers/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.12/0004-Properly-handle-drain-requests-while-flushing.patch b/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.12/0004-Properly-handle-drain-requests-while-flushing.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.12/0004-Properly-handle-drain-requests-while-flushing.patch
rename to meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.12/0004-Properly-handle-drain-requests-while-flushing.patch
diff --git a/import-layers/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.12/0005-Don-t-abort-gst_omx_video_dec_set_format-if-there-s-.patch b/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.12/0005-Don-t-abort-gst_omx_video_dec_set_format-if-there-s-.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.12/0005-Don-t-abort-gst_omx_video_dec_set_format-if-there-s-.patch
rename to meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.12/0005-Don-t-abort-gst_omx_video_dec_set_format-if-there-s-.patch
diff --git a/import-layers/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend b/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend
rename to meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend
diff --git a/import-layers/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.12%.bbappend b/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.12%.bbappend
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.12%.bbappend
rename to meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.12%.bbappend
diff --git a/import-layers/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
rename to meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
diff --git a/import-layers/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0001-Remove-Makefile.include-which-includes-hardcoded.patch b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0001-Remove-Makefile.include-which-includes-hardcoded.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0001-Remove-Makefile.include-which-includes-hardcoded.patch
rename to meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0001-Remove-Makefile.include-which-includes-hardcoded.patch
diff --git a/import-layers/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch
rename to meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch
diff --git a/import-layers/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0003-Remove-strip-step-in-Makefile.patch b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0003-Remove-strip-step-in-Makefile.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0003-Remove-strip-step-in-Makefile.patch
rename to meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0003-Remove-strip-step-in-Makefile.patch
diff --git a/import-layers/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch
rename to meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0004-Add-FFMPEG_EXTRA_CFLAGS-and-FFMPEG_EXTRA_LDFLAGS.patch
diff --git a/import-layers/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0005-Don-t-require-internet-connection-during-build.patch b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0005-Don-t-require-internet-connection-during-build.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0005-Don-t-require-internet-connection-during-build.patch
rename to meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0005-Don-t-require-internet-connection-during-build.patch
diff --git a/import-layers/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0006-Prevent-ffmpeg-configure-compile-race-condition.patch b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0006-Prevent-ffmpeg-configure-compile-race-condition.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0006-Prevent-ffmpeg-configure-compile-race-condition.patch
rename to meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0006-Prevent-ffmpeg-configure-compile-race-condition.patch
diff --git a/import-layers/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/fix-tar-command-with-DIST.patch b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/fix-tar-command-with-DIST.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/fix-tar-command-with-DIST.patch
rename to meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/fix-tar-command-with-DIST.patch
diff --git a/import-layers/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/use-native-pkg-config.patch b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/use-native-pkg-config.patch
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/use-native-pkg-config.patch
rename to meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/use-native-pkg-config.patch
diff --git a/import-layers/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer_git.bb b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer_git.bb
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer_git.bb
rename to meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer_git.bb
diff --git a/import-layers/meta-raspberrypi/recipes-multimedia/x264/x264_git.bbappend b/meta-raspberrypi/recipes-multimedia/x264/x264_git.bbappend
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-multimedia/x264/x264_git.bbappend
rename to meta-raspberrypi/recipes-multimedia/x264/x264_git.bbappend
diff --git a/import-layers/meta-raspberrypi/recipes-sato/webkitgtk/webkitgtk_%.bbappend b/meta-raspberrypi/recipes-sato/webkitgtk/webkitgtk_%.bbappend
similarity index 100%
rename from import-layers/meta-raspberrypi/recipes-sato/webkitgtk/webkitgtk_%.bbappend
rename to meta-raspberrypi/recipes-sato/webkitgtk/webkitgtk_%.bbappend
diff --git a/import-layers/meta-raspberrypi/wic/sdimage-raspberrypi.wks b/meta-raspberrypi/wic/sdimage-raspberrypi.wks
similarity index 100%
rename from import-layers/meta-raspberrypi/wic/sdimage-raspberrypi.wks
rename to meta-raspberrypi/wic/sdimage-raspberrypi.wks
diff --git a/import-layers/meta-security/COPYING.MIT b/meta-security/COPYING.MIT
similarity index 100%
rename from import-layers/meta-security/COPYING.MIT
rename to meta-security/COPYING.MIT
diff --git a/import-layers/meta-security/README b/meta-security/README
similarity index 100%
rename from import-layers/meta-security/README
rename to meta-security/README
diff --git a/import-layers/meta-security/classes/check_security.bbclass b/meta-security/classes/check_security.bbclass
similarity index 100%
rename from import-layers/meta-security/classes/check_security.bbclass
rename to meta-security/classes/check_security.bbclass
diff --git a/import-layers/meta-security/conf/layer.conf b/meta-security/conf/layer.conf
similarity index 100%
rename from import-layers/meta-security/conf/layer.conf
rename to meta-security/conf/layer.conf
diff --git a/import-layers/meta-security/meta-security-compliance/README b/meta-security/meta-security-compliance/README
similarity index 100%
rename from import-layers/meta-security/meta-security-compliance/README
rename to meta-security/meta-security-compliance/README
diff --git a/import-layers/meta-security/meta-security-compliance/conf/layer.conf b/meta-security/meta-security-compliance/conf/layer.conf
similarity index 100%
rename from import-layers/meta-security/meta-security-compliance/conf/layer.conf
rename to meta-security/meta-security-compliance/conf/layer.conf
diff --git a/import-layers/meta-security/meta-security-compliance/recipes-auditors/lynis/lynis_2.5.1.bb b/meta-security/meta-security-compliance/recipes-auditors/lynis/lynis_2.5.1.bb
similarity index 100%
rename from import-layers/meta-security/meta-security-compliance/recipes-auditors/lynis/lynis_2.5.1.bb
rename to meta-security/meta-security-compliance/recipes-auditors/lynis/lynis_2.5.1.bb
diff --git a/import-layers/meta-security/meta-security-compliance/recipes-core/openembedded-release/openembedded-release_1.0.bb b/meta-security/meta-security-compliance/recipes-core/openembedded-release/openembedded-release_1.0.bb
similarity index 100%
rename from import-layers/meta-security/meta-security-compliance/recipes-core/openembedded-release/openembedded-release_1.0.bb
rename to meta-security/meta-security-compliance/recipes-core/openembedded-release/openembedded-release_1.0.bb
diff --git a/import-layers/meta-security/meta-security-compliance/recipes-core/os-release/os-release.bbappend b/meta-security/meta-security-compliance/recipes-core/os-release/os-release.bbappend
similarity index 100%
rename from import-layers/meta-security/meta-security-compliance/recipes-core/os-release/os-release.bbappend
rename to meta-security/meta-security-compliance/recipes-core/os-release/os-release.bbappend
diff --git a/import-layers/meta-security/meta-security-compliance/recipes-openscap/oe-scap/files/OpenEmbedded_nodistro_0.xccdf.xml b/meta-security/meta-security-compliance/recipes-openscap/oe-scap/files/OpenEmbedded_nodistro_0.xccdf.xml
similarity index 100%
rename from import-layers/meta-security/meta-security-compliance/recipes-openscap/oe-scap/files/OpenEmbedded_nodistro_0.xccdf.xml
rename to meta-security/meta-security-compliance/recipes-openscap/oe-scap/files/OpenEmbedded_nodistro_0.xccdf.xml
diff --git a/import-layers/meta-security/meta-security-compliance/recipes-openscap/oe-scap/files/OpenEmbedded_nodistro_0.xml b/meta-security/meta-security-compliance/recipes-openscap/oe-scap/files/OpenEmbedded_nodistro_0.xml
similarity index 100%
rename from import-layers/meta-security/meta-security-compliance/recipes-openscap/oe-scap/files/OpenEmbedded_nodistro_0.xml
rename to meta-security/meta-security-compliance/recipes-openscap/oe-scap/files/OpenEmbedded_nodistro_0.xml
diff --git a/import-layers/meta-security/meta-security-compliance/recipes-openscap/oe-scap/files/oval-to-xccdf.xslt b/meta-security/meta-security-compliance/recipes-openscap/oe-scap/files/oval-to-xccdf.xslt
similarity index 100%
rename from import-layers/meta-security/meta-security-compliance/recipes-openscap/oe-scap/files/oval-to-xccdf.xslt
rename to meta-security/meta-security-compliance/recipes-openscap/oe-scap/files/oval-to-xccdf.xslt
diff --git a/import-layers/meta-security/meta-security-compliance/recipes-openscap/oe-scap/files/run_cve.sh b/meta-security/meta-security-compliance/recipes-openscap/oe-scap/files/run_cve.sh
similarity index 100%
rename from import-layers/meta-security/meta-security-compliance/recipes-openscap/oe-scap/files/run_cve.sh
rename to meta-security/meta-security-compliance/recipes-openscap/oe-scap/files/run_cve.sh
diff --git a/import-layers/meta-security/meta-security-compliance/recipes-openscap/oe-scap/files/run_test.sh b/meta-security/meta-security-compliance/recipes-openscap/oe-scap/files/run_test.sh
similarity index 100%
rename from import-layers/meta-security/meta-security-compliance/recipes-openscap/oe-scap/files/run_test.sh
rename to meta-security/meta-security-compliance/recipes-openscap/oe-scap/files/run_test.sh
diff --git a/import-layers/meta-security/meta-security-compliance/recipes-openscap/oe-scap/oe-scap_1.0.bb b/meta-security/meta-security-compliance/recipes-openscap/oe-scap/oe-scap_1.0.bb
similarity index 100%
rename from import-layers/meta-security/meta-security-compliance/recipes-openscap/oe-scap/oe-scap_1.0.bb
rename to meta-security/meta-security-compliance/recipes-openscap/oe-scap/oe-scap_1.0.bb
diff --git a/import-layers/meta-security/meta-security-compliance/recipes-openscap/openscap-daemon/openscap-daemon_0.1.6.bb b/meta-security/meta-security-compliance/recipes-openscap/openscap-daemon/openscap-daemon_0.1.6.bb
similarity index 100%
rename from import-layers/meta-security/meta-security-compliance/recipes-openscap/openscap-daemon/openscap-daemon_0.1.6.bb
rename to meta-security/meta-security-compliance/recipes-openscap/openscap-daemon/openscap-daemon_0.1.6.bb
diff --git a/import-layers/meta-security/meta-security-compliance/recipes-openscap/openscap/files/crypto_pkgconfig.patch b/meta-security/meta-security-compliance/recipes-openscap/openscap/files/crypto_pkgconfig.patch
similarity index 100%
rename from import-layers/meta-security/meta-security-compliance/recipes-openscap/openscap/files/crypto_pkgconfig.patch
rename to meta-security/meta-security-compliance/recipes-openscap/openscap/files/crypto_pkgconfig.patch
diff --git a/import-layers/meta-security/meta-security-compliance/recipes-openscap/openscap/files/probe_dir_fixup.patch b/meta-security/meta-security-compliance/recipes-openscap/openscap/files/probe_dir_fixup.patch
similarity index 100%
rename from import-layers/meta-security/meta-security-compliance/recipes-openscap/openscap/files/probe_dir_fixup.patch
rename to meta-security/meta-security-compliance/recipes-openscap/openscap/files/probe_dir_fixup.patch
diff --git a/import-layers/meta-security/meta-security-compliance/recipes-openscap/openscap/files/run-ptest b/meta-security/meta-security-compliance/recipes-openscap/openscap/files/run-ptest
similarity index 100%
rename from import-layers/meta-security/meta-security-compliance/recipes-openscap/openscap/files/run-ptest
rename to meta-security/meta-security-compliance/recipes-openscap/openscap/files/run-ptest
diff --git a/import-layers/meta-security/meta-security-compliance/recipes-openscap/openscap/openscap.inc b/meta-security/meta-security-compliance/recipes-openscap/openscap/openscap.inc
similarity index 100%
rename from import-layers/meta-security/meta-security-compliance/recipes-openscap/openscap/openscap.inc
rename to meta-security/meta-security-compliance/recipes-openscap/openscap/openscap.inc
diff --git a/import-layers/meta-security/meta-security-compliance/recipes-openscap/openscap/openscap_1.2.15.bb b/meta-security/meta-security-compliance/recipes-openscap/openscap/openscap_1.2.15.bb
similarity index 100%
rename from import-layers/meta-security/meta-security-compliance/recipes-openscap/openscap/openscap_1.2.15.bb
rename to meta-security/meta-security-compliance/recipes-openscap/openscap/openscap_1.2.15.bb
diff --git a/import-layers/meta-security/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide_0.1.33.bb b/meta-security/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide_0.1.33.bb
similarity index 100%
rename from import-layers/meta-security/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide_0.1.33.bb
rename to meta-security/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide_0.1.33.bb
diff --git a/import-layers/meta-security/meta-tpm/README b/meta-security/meta-tpm/README
similarity index 100%
rename from import-layers/meta-security/meta-tpm/README
rename to meta-security/meta-tpm/README
diff --git a/import-layers/meta-security/meta-tpm/conf/layer.conf b/meta-security/meta-tpm/conf/layer.conf
similarity index 100%
rename from import-layers/meta-security/meta-tpm/conf/layer.conf
rename to meta-security/meta-tpm/conf/layer.conf
diff --git a/import-layers/meta-security/meta-tpm/recipes-core/images/security-tpm-image.bb b/meta-security/meta-tpm/recipes-core/images/security-tpm-image.bb
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-core/images/security-tpm-image.bb
rename to meta-security/meta-tpm/recipes-core/images/security-tpm-image.bb
diff --git a/import-layers/meta-security/meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm-i2c.bb b/meta-security/meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm-i2c.bb
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm-i2c.bb
rename to meta-security/meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm-i2c.bb
diff --git a/import-layers/meta-security/meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm.bb b/meta-security/meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm.bb
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm.bb
rename to meta-security/meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm.bb
diff --git a/import-layers/meta-security/meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm2.bb b/meta-security/meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm2.bb
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm2.bb
rename to meta-security/meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm2.bb
diff --git a/import-layers/meta-security/meta-tpm/recipes-core/packagegroup/packagegroup-security-vtpm.bb b/meta-security/meta-tpm/recipes-core/packagegroup/packagegroup-security-vtpm.bb
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-core/packagegroup/packagegroup-security-vtpm.bb
rename to meta-security/meta-tpm/recipes-core/packagegroup/packagegroup-security-vtpm.bb
diff --git a/import-layers/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm.cfg b/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm.cfg
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm.cfg
rename to meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm.cfg
diff --git a/import-layers/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm.scc b/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm.scc
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm.scc
rename to meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm.scc
diff --git a/import-layers/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm2.cfg b/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm2.cfg
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm2.cfg
rename to meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm2.cfg
diff --git a/import-layers/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm2.scc b/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm2.scc
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm2.scc
rename to meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm2.scc
diff --git a/import-layers/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm_i2c.cfg b/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm_i2c.cfg
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm_i2c.cfg
rename to meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm_i2c.cfg
diff --git a/import-layers/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm_i2c.scc b/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm_i2c.scc
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm_i2c.scc
rename to meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm_i2c.scc
diff --git a/import-layers/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm_x86.cfg b/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm_x86.cfg
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm_x86.cfg
rename to meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/tpm_x86.cfg
diff --git a/import-layers/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/vtpm.cfg b/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/vtpm.cfg
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/vtpm.cfg
rename to meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/vtpm.cfg
diff --git a/import-layers/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/vtpm.scc b/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/vtpm.scc
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/vtpm.scc
rename to meta-security/meta-tpm/recipes-kernel/linux/linux-yocto/vtpm.scc
diff --git a/import-layers/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto_4.%.bbappend b/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto_4.%.bbappend
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-kernel/linux/linux-yocto_4.%.bbappend
rename to meta-security/meta-tpm/recipes-kernel/linux/linux-yocto_4.%.bbappend
diff --git a/import-layers/meta-security/meta-tpm/recipes-tpm/libtpm/files/Convert-another-vdprintf-to-dprintf.patch b/meta-security/meta-tpm/recipes-tpm/libtpm/files/Convert-another-vdprintf-to-dprintf.patch
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-tpm/libtpm/files/Convert-another-vdprintf-to-dprintf.patch
rename to meta-security/meta-tpm/recipes-tpm/libtpm/files/Convert-another-vdprintf-to-dprintf.patch
diff --git a/import-layers/meta-security/meta-tpm/recipes-tpm/libtpm/files/Use-format-s-for-call-to-dprintf.patch b/meta-security/meta-tpm/recipes-tpm/libtpm/files/Use-format-s-for-call-to-dprintf.patch
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-tpm/libtpm/files/Use-format-s-for-call-to-dprintf.patch
rename to meta-security/meta-tpm/recipes-tpm/libtpm/files/Use-format-s-for-call-to-dprintf.patch
diff --git a/import-layers/meta-security/meta-tpm/recipes-tpm/libtpm/files/fix_signed_issue.patch b/meta-security/meta-tpm/recipes-tpm/libtpm/files/fix_signed_issue.patch
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-tpm/libtpm/files/fix_signed_issue.patch
rename to meta-security/meta-tpm/recipes-tpm/libtpm/files/fix_signed_issue.patch
diff --git a/import-layers/meta-security/meta-tpm/recipes-tpm/libtpm/libtpm_1.0.bb b/meta-security/meta-tpm/recipes-tpm/libtpm/libtpm_1.0.bb
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-tpm/libtpm/libtpm_1.0.bb
rename to meta-security/meta-tpm/recipes-tpm/libtpm/libtpm_1.0.bb
diff --git a/import-layers/meta-security/meta-tpm/recipes-tpm/openssl-tpm-engine/files/0001-create-tpm-key-support-well-known-key-option.patch b/meta-security/meta-tpm/recipes-tpm/openssl-tpm-engine/files/0001-create-tpm-key-support-well-known-key-option.patch
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-tpm/openssl-tpm-engine/files/0001-create-tpm-key-support-well-known-key-option.patch
rename to meta-security/meta-tpm/recipes-tpm/openssl-tpm-engine/files/0001-create-tpm-key-support-well-known-key-option.patch
diff --git a/import-layers/meta-security/meta-tpm/recipes-tpm/openssl-tpm-engine/files/0002-libtpm-support-env-TPM_SRK_PW.patch b/meta-security/meta-tpm/recipes-tpm/openssl-tpm-engine/files/0002-libtpm-support-env-TPM_SRK_PW.patch
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-tpm/openssl-tpm-engine/files/0002-libtpm-support-env-TPM_SRK_PW.patch
rename to meta-security/meta-tpm/recipes-tpm/openssl-tpm-engine/files/0002-libtpm-support-env-TPM_SRK_PW.patch
diff --git a/import-layers/meta-security/meta-tpm/recipes-tpm/openssl-tpm-engine/files/0003-Fix-not-building-libtpm.la.patch b/meta-security/meta-tpm/recipes-tpm/openssl-tpm-engine/files/0003-Fix-not-building-libtpm.la.patch
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-tpm/openssl-tpm-engine/files/0003-Fix-not-building-libtpm.la.patch
rename to meta-security/meta-tpm/recipes-tpm/openssl-tpm-engine/files/0003-Fix-not-building-libtpm.la.patch
diff --git a/import-layers/meta-security/meta-tpm/recipes-tpm/openssl-tpm-engine/files/0003-tpm-openssl-tpm-engine-parse-an-encrypted-tpm-SRK-pa.patch b/meta-security/meta-tpm/recipes-tpm/openssl-tpm-engine/files/0003-tpm-openssl-tpm-engine-parse-an-encrypted-tpm-SRK-pa.patch
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-tpm/openssl-tpm-engine/files/0003-tpm-openssl-tpm-engine-parse-an-encrypted-tpm-SRK-pa.patch
rename to meta-security/meta-tpm/recipes-tpm/openssl-tpm-engine/files/0003-tpm-openssl-tpm-engine-parse-an-encrypted-tpm-SRK-pa.patch
diff --git a/import-layers/meta-security/meta-tpm/recipes-tpm/openssl-tpm-engine/files/0004-tpm-openssl-tpm-engine-change-variable-c-type-from-c.patch b/meta-security/meta-tpm/recipes-tpm/openssl-tpm-engine/files/0004-tpm-openssl-tpm-engine-change-variable-c-type-from-c.patch
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-tpm/openssl-tpm-engine/files/0004-tpm-openssl-tpm-engine-change-variable-c-type-from-c.patch
rename to meta-security/meta-tpm/recipes-tpm/openssl-tpm-engine/files/0004-tpm-openssl-tpm-engine-change-variable-c-type-from-c.patch
diff --git a/import-layers/meta-security/meta-tpm/recipes-tpm/openssl-tpm-engine/openssl-tpm-engine_0.4.2.bb b/meta-security/meta-tpm/recipes-tpm/openssl-tpm-engine/openssl-tpm-engine_0.4.2.bb
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-tpm/openssl-tpm-engine/openssl-tpm-engine_0.4.2.bb
rename to meta-security/meta-tpm/recipes-tpm/openssl-tpm-engine/openssl-tpm-engine_0.4.2.bb
diff --git a/import-layers/meta-security/meta-tpm/recipes-tpm/pcr-extend/pcr-extend_git.bb b/meta-security/meta-tpm/recipes-tpm/pcr-extend/pcr-extend_git.bb
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-tpm/pcr-extend/pcr-extend_git.bb
rename to meta-security/meta-tpm/recipes-tpm/pcr-extend/pcr-extend_git.bb
diff --git a/import-layers/meta-security/meta-tpm/recipes-tpm/swtpm/files/fix_fcntl_h.patch b/meta-security/meta-tpm/recipes-tpm/swtpm/files/fix_fcntl_h.patch
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-tpm/swtpm/files/fix_fcntl_h.patch
rename to meta-security/meta-tpm/recipes-tpm/swtpm/files/fix_fcntl_h.patch
diff --git a/import-layers/meta-security/meta-tpm/recipes-tpm/swtpm/files/fix_lib_search_path.patch b/meta-security/meta-tpm/recipes-tpm/swtpm/files/fix_lib_search_path.patch
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-tpm/swtpm/files/fix_lib_search_path.patch
rename to meta-security/meta-tpm/recipes-tpm/swtpm/files/fix_lib_search_path.patch
diff --git a/import-layers/meta-security/meta-tpm/recipes-tpm/swtpm/files/ioctl_h.patch b/meta-security/meta-tpm/recipes-tpm/swtpm/files/ioctl_h.patch
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-tpm/swtpm/files/ioctl_h.patch
rename to meta-security/meta-tpm/recipes-tpm/swtpm/files/ioctl_h.patch
diff --git a/import-layers/meta-security/meta-tpm/recipes-tpm/swtpm/swtpm-wrappers-native.bb b/meta-security/meta-tpm/recipes-tpm/swtpm/swtpm-wrappers-native.bb
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-tpm/swtpm/swtpm-wrappers-native.bb
rename to meta-security/meta-tpm/recipes-tpm/swtpm/swtpm-wrappers-native.bb
diff --git a/import-layers/meta-security/meta-tpm/recipes-tpm/swtpm/swtpm_1.0.bb b/meta-security/meta-tpm/recipes-tpm/swtpm/swtpm_1.0.bb
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-tpm/swtpm/swtpm_1.0.bb
rename to meta-security/meta-tpm/recipes-tpm/swtpm/swtpm_1.0.bb
diff --git a/import-layers/meta-security/meta-tpm/recipes-tpm/tpm-quote-tools/tpm-quote-tools_1.0.4.bb b/meta-security/meta-tpm/recipes-tpm/tpm-quote-tools/tpm-quote-tools_1.0.4.bb
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-tpm/tpm-quote-tools/tpm-quote-tools_1.0.4.bb
rename to meta-security/meta-tpm/recipes-tpm/tpm-quote-tools/tpm-quote-tools_1.0.4.bb
diff --git a/import-layers/meta-security/meta-tpm/recipes-tpm/tpm-tools/files/tpm-tools-extendpcr.patch b/meta-security/meta-tpm/recipes-tpm/tpm-tools/files/tpm-tools-extendpcr.patch
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-tpm/tpm-tools/files/tpm-tools-extendpcr.patch
rename to meta-security/meta-tpm/recipes-tpm/tpm-tools/files/tpm-tools-extendpcr.patch
diff --git a/import-layers/meta-security/meta-tpm/recipes-tpm/tpm-tools/tpm-tools_git.bb b/meta-security/meta-tpm/recipes-tpm/tpm-tools/tpm-tools_git.bb
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-tpm/tpm-tools/tpm-tools_git.bb
rename to meta-security/meta-tpm/recipes-tpm/tpm-tools/tpm-tools_git.bb
diff --git a/import-layers/meta-security/meta-tpm/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd-init.sh b/meta-security/meta-tpm/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd-init.sh
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd-init.sh
rename to meta-security/meta-tpm/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd-init.sh
diff --git a/import-layers/meta-security/meta-tpm/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd.default b/meta-security/meta-tpm/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd.default
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd.default
rename to meta-security/meta-tpm/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd.default
diff --git a/import-layers/meta-security/meta-tpm/recipes-tpm/tpm2-abrmd/tpm2-abrmd_1.2.0.bb b/meta-security/meta-tpm/recipes-tpm/tpm2-abrmd/tpm2-abrmd_1.2.0.bb
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-tpm/tpm2-abrmd/tpm2-abrmd_1.2.0.bb
rename to meta-security/meta-tpm/recipes-tpm/tpm2-abrmd/tpm2-abrmd_1.2.0.bb
diff --git a/import-layers/meta-security/meta-tpm/recipes-tpm/tpm2.0-tools/tpm2.0-tools_git.bb b/meta-security/meta-tpm/recipes-tpm/tpm2.0-tools/tpm2.0-tools_git.bb
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-tpm/tpm2.0-tools/tpm2.0-tools_git.bb
rename to meta-security/meta-tpm/recipes-tpm/tpm2.0-tools/tpm2.0-tools_git.bb
diff --git a/import-layers/meta-security/meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss/ax_pthread.m4 b/meta-security/meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss/ax_pthread.m4
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss/ax_pthread.m4
rename to meta-security/meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss/ax_pthread.m4
diff --git a/import-layers/meta-security/meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss/fix_musl_select_include.patch b/meta-security/meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss/fix_musl_select_include.patch
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss/fix_musl_select_include.patch
rename to meta-security/meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss/fix_musl_select_include.patch
diff --git a/import-layers/meta-security/meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss_1.3.0.bb b/meta-security/meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss_1.3.0.bb
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss_1.3.0.bb
rename to meta-security/meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss_1.3.0.bb
diff --git a/import-layers/meta-security/meta-tpm/recipes-tpm/tpm2simulator/tpm2simulator-native_138.bb b/meta-security/meta-tpm/recipes-tpm/tpm2simulator/tpm2simulator-native_138.bb
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-tpm/tpm2simulator/tpm2simulator-native_138.bb
rename to meta-security/meta-tpm/recipes-tpm/tpm2simulator/tpm2simulator-native_138.bb
diff --git a/import-layers/meta-security/meta-tpm/recipes-tpm/trousers/files/0001-build-don-t-override-localstatedir-mandir-sysconfdir.patch b/meta-security/meta-tpm/recipes-tpm/trousers/files/0001-build-don-t-override-localstatedir-mandir-sysconfdir.patch
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-tpm/trousers/files/0001-build-don-t-override-localstatedir-mandir-sysconfdir.patch
rename to meta-security/meta-tpm/recipes-tpm/trousers/files/0001-build-don-t-override-localstatedir-mandir-sysconfdir.patch
diff --git a/import-layers/meta-security/meta-tpm/recipes-tpm/trousers/files/get-user-ps-path-use-POSIX-getpwent-instead-of-getpwe.patch b/meta-security/meta-tpm/recipes-tpm/trousers/files/get-user-ps-path-use-POSIX-getpwent-instead-of-getpwe.patch
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-tpm/trousers/files/get-user-ps-path-use-POSIX-getpwent-instead-of-getpwe.patch
rename to meta-security/meta-tpm/recipes-tpm/trousers/files/get-user-ps-path-use-POSIX-getpwent-instead-of-getpwe.patch
diff --git a/import-layers/meta-security/meta-tpm/recipes-tpm/trousers/files/tcsd.service b/meta-security/meta-tpm/recipes-tpm/trousers/files/tcsd.service
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-tpm/trousers/files/tcsd.service
rename to meta-security/meta-tpm/recipes-tpm/trousers/files/tcsd.service
diff --git a/import-layers/meta-security/meta-tpm/recipes-tpm/trousers/files/trousers-udev.rules b/meta-security/meta-tpm/recipes-tpm/trousers/files/trousers-udev.rules
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-tpm/trousers/files/trousers-udev.rules
rename to meta-security/meta-tpm/recipes-tpm/trousers/files/trousers-udev.rules
diff --git a/import-layers/meta-security/meta-tpm/recipes-tpm/trousers/files/trousers.init.sh b/meta-security/meta-tpm/recipes-tpm/trousers/files/trousers.init.sh
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-tpm/trousers/files/trousers.init.sh
rename to meta-security/meta-tpm/recipes-tpm/trousers/files/trousers.init.sh
diff --git a/import-layers/meta-security/meta-tpm/recipes-tpm/trousers/trousers_git.bb b/meta-security/meta-tpm/recipes-tpm/trousers/trousers_git.bb
similarity index 100%
rename from import-layers/meta-security/meta-tpm/recipes-tpm/trousers/trousers_git.bb
rename to meta-security/meta-tpm/recipes-tpm/trousers/trousers_git.bb
diff --git a/import-layers/meta-security/recipes-browers/tor/tor_6.5.2.bb b/meta-security/recipes-browers/tor/tor_6.5.2.bb
similarity index 100%
rename from import-layers/meta-security/recipes-browers/tor/tor_6.5.2.bb
rename to meta-security/recipes-browers/tor/tor_6.5.2.bb
diff --git a/import-layers/meta-security/recipes-core/busybox/busybox/head.cfg b/meta-security/recipes-core/busybox/busybox/head.cfg
similarity index 100%
rename from import-layers/meta-security/recipes-core/busybox/busybox/head.cfg
rename to meta-security/recipes-core/busybox/busybox/head.cfg
diff --git a/import-layers/meta-security/recipes-core/busybox/busybox_%.bbappend b/meta-security/recipes-core/busybox/busybox_%.bbappend
similarity index 100%
rename from import-layers/meta-security/recipes-core/busybox/busybox_%.bbappend
rename to meta-security/recipes-core/busybox/busybox_%.bbappend
diff --git a/import-layers/meta-security/recipes-forensic/afflib/afflib_3.6.6.bb b/meta-security/recipes-forensic/afflib/afflib_3.6.6.bb
similarity index 100%
rename from import-layers/meta-security/recipes-forensic/afflib/afflib_3.6.6.bb
rename to meta-security/recipes-forensic/afflib/afflib_3.6.6.bb
diff --git a/import-layers/meta-security/recipes-forensic/afflib/files/configure_rm_ms_flags.patch b/meta-security/recipes-forensic/afflib/files/configure_rm_ms_flags.patch
similarity index 100%
rename from import-layers/meta-security/recipes-forensic/afflib/files/configure_rm_ms_flags.patch
rename to meta-security/recipes-forensic/afflib/files/configure_rm_ms_flags.patch
diff --git a/import-layers/meta-security/recipes-forensic/libewf/files/gcc5_fix.patch b/meta-security/recipes-forensic/libewf/files/gcc5_fix.patch
similarity index 100%
rename from import-layers/meta-security/recipes-forensic/libewf/files/gcc5_fix.patch
rename to meta-security/recipes-forensic/libewf/files/gcc5_fix.patch
diff --git a/import-layers/meta-security/recipes-forensic/libewf/libewf_20140608.bb b/meta-security/recipes-forensic/libewf/libewf_20140608.bb
similarity index 100%
rename from import-layers/meta-security/recipes-forensic/libewf/libewf_20140608.bb
rename to meta-security/recipes-forensic/libewf/libewf_20140608.bb
diff --git a/import-layers/meta-security/recipes-forensic/sleuth/files/fix_host_poison.patch b/meta-security/recipes-forensic/sleuth/files/fix_host_poison.patch
similarity index 100%
rename from import-layers/meta-security/recipes-forensic/sleuth/files/fix_host_poison.patch
rename to meta-security/recipes-forensic/sleuth/files/fix_host_poison.patch
diff --git a/import-layers/meta-security/recipes-forensic/sleuth/sleuthkit_4.1.3.bb b/meta-security/recipes-forensic/sleuth/sleuthkit_4.1.3.bb
similarity index 100%
rename from import-layers/meta-security/recipes-forensic/sleuth/sleuthkit_4.1.3.bb
rename to meta-security/recipes-forensic/sleuth/sleuthkit_4.1.3.bb
diff --git a/import-layers/meta-security/recipes-kernel/linux/linux-yocto/apparmor.cfg b/meta-security/recipes-kernel/linux/linux-yocto/apparmor.cfg
similarity index 100%
rename from import-layers/meta-security/recipes-kernel/linux/linux-yocto/apparmor.cfg
rename to meta-security/recipes-kernel/linux/linux-yocto/apparmor.cfg
diff --git a/import-layers/meta-security/recipes-kernel/linux/linux-yocto/smack-default-lsm.cfg b/meta-security/recipes-kernel/linux/linux-yocto/smack-default-lsm.cfg
similarity index 100%
rename from import-layers/meta-security/recipes-kernel/linux/linux-yocto/smack-default-lsm.cfg
rename to meta-security/recipes-kernel/linux/linux-yocto/smack-default-lsm.cfg
diff --git a/import-layers/meta-security/recipes-kernel/linux/linux-yocto/smack.cfg b/meta-security/recipes-kernel/linux/linux-yocto/smack.cfg
similarity index 100%
rename from import-layers/meta-security/recipes-kernel/linux/linux-yocto/smack.cfg
rename to meta-security/recipes-kernel/linux/linux-yocto/smack.cfg
diff --git a/import-layers/meta-security/recipes-kernel/linux/linux-yocto_4.%.bbappend b/meta-security/recipes-kernel/linux/linux-yocto_4.%.bbappend
similarity index 100%
rename from import-layers/meta-security/recipes-kernel/linux/linux-yocto_4.%.bbappend
rename to meta-security/recipes-kernel/linux/linux-yocto_4.%.bbappend
diff --git a/import-layers/meta-security/recipes-perl/perl/files/libwhisker2.patch b/meta-security/recipes-perl/perl/files/libwhisker2.patch
similarity index 100%
rename from import-layers/meta-security/recipes-perl/perl/files/libwhisker2.patch
rename to meta-security/recipes-perl/perl/files/libwhisker2.patch
diff --git a/import-layers/meta-security/recipes-perl/perl/lib-perl_0.63.bb b/meta-security/recipes-perl/perl/lib-perl_0.63.bb
similarity index 100%
rename from import-layers/meta-security/recipes-perl/perl/lib-perl_0.63.bb
rename to meta-security/recipes-perl/perl/lib-perl_0.63.bb
diff --git a/import-layers/meta-security/recipes-perl/perl/libenv-perl_1.04.bb b/meta-security/recipes-perl/perl/libenv-perl_1.04.bb
similarity index 100%
rename from import-layers/meta-security/recipes-perl/perl/libenv-perl_1.04.bb
rename to meta-security/recipes-perl/perl/libenv-perl_1.04.bb
diff --git a/import-layers/meta-security/recipes-perl/perl/libwhisker2-perl_2.5.bb b/meta-security/recipes-perl/perl/libwhisker2-perl_2.5.bb
similarity index 100%
rename from import-layers/meta-security/recipes-perl/perl/libwhisker2-perl_2.5.bb
rename to meta-security/recipes-perl/perl/libwhisker2-perl_2.5.bb
diff --git a/import-layers/meta-security/recipes-security/AppArmor/apparmor_2.11.0.bb b/meta-security/recipes-security/AppArmor/apparmor_2.11.0.bb
similarity index 100%
rename from import-layers/meta-security/recipes-security/AppArmor/apparmor_2.11.0.bb
rename to meta-security/recipes-security/AppArmor/apparmor_2.11.0.bb
diff --git a/import-layers/meta-security/recipes-security/AppArmor/files/apparmor b/meta-security/recipes-security/AppArmor/files/apparmor
similarity index 100%
rename from import-layers/meta-security/recipes-security/AppArmor/files/apparmor
rename to meta-security/recipes-security/AppArmor/files/apparmor
diff --git a/import-layers/meta-security/recipes-security/AppArmor/files/apparmor.rc b/meta-security/recipes-security/AppArmor/files/apparmor.rc
similarity index 100%
rename from import-layers/meta-security/recipes-security/AppArmor/files/apparmor.rc
rename to meta-security/recipes-security/AppArmor/files/apparmor.rc
diff --git a/import-layers/meta-security/recipes-security/AppArmor/files/apparmor.service b/meta-security/recipes-security/AppArmor/files/apparmor.service
similarity index 100%
rename from import-layers/meta-security/recipes-security/AppArmor/files/apparmor.service
rename to meta-security/recipes-security/AppArmor/files/apparmor.service
diff --git a/import-layers/meta-security/recipes-security/AppArmor/files/crosscompile_perl_bindings.patch b/meta-security/recipes-security/AppArmor/files/crosscompile_perl_bindings.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/AppArmor/files/crosscompile_perl_bindings.patch
rename to meta-security/recipes-security/AppArmor/files/crosscompile_perl_bindings.patch
diff --git a/import-layers/meta-security/recipes-security/AppArmor/files/disable_pdf.patch b/meta-security/recipes-security/AppArmor/files/disable_pdf.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/AppArmor/files/disable_pdf.patch
rename to meta-security/recipes-security/AppArmor/files/disable_pdf.patch
diff --git a/import-layers/meta-security/recipes-security/AppArmor/files/disable_perl_h_check.patch b/meta-security/recipes-security/AppArmor/files/disable_perl_h_check.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/AppArmor/files/disable_perl_h_check.patch
rename to meta-security/recipes-security/AppArmor/files/disable_perl_h_check.patch
diff --git a/import-layers/meta-security/recipes-security/AppArmor/files/functions b/meta-security/recipes-security/AppArmor/files/functions
similarity index 100%
rename from import-layers/meta-security/recipes-security/AppArmor/files/functions
rename to meta-security/recipes-security/AppArmor/files/functions
diff --git a/import-layers/meta-security/recipes-security/AppArmor/files/run-ptest b/meta-security/recipes-security/AppArmor/files/run-ptest
similarity index 100%
rename from import-layers/meta-security/recipes-security/AppArmor/files/run-ptest
rename to meta-security/recipes-security/AppArmor/files/run-ptest
diff --git a/import-layers/meta-security/recipes-security/aircrack-ng/aircrack-ng_1.2.bb b/meta-security/recipes-security/aircrack-ng/aircrack-ng_1.2.bb
similarity index 100%
rename from import-layers/meta-security/recipes-security/aircrack-ng/aircrack-ng_1.2.bb
rename to meta-security/recipes-security/aircrack-ng/aircrack-ng_1.2.bb
diff --git a/import-layers/meta-security/recipes-security/aircrack-ng/files/fixup_cflags.patch b/meta-security/recipes-security/aircrack-ng/files/fixup_cflags.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/aircrack-ng/files/fixup_cflags.patch
rename to meta-security/recipes-security/aircrack-ng/files/fixup_cflags.patch
diff --git a/import-layers/meta-security/recipes-security/bastille/bastille_3.2.1.bb b/meta-security/recipes-security/bastille/bastille_3.2.1.bb
similarity index 100%
rename from import-layers/meta-security/recipes-security/bastille/bastille_3.2.1.bb
rename to meta-security/recipes-security/bastille/bastille_3.2.1.bb
diff --git a/import-layers/meta-security/recipes-security/bastille/files/API.pm b/meta-security/recipes-security/bastille/files/API.pm
similarity index 100%
rename from import-layers/meta-security/recipes-security/bastille/files/API.pm
rename to meta-security/recipes-security/bastille/files/API.pm
diff --git a/import-layers/meta-security/recipes-security/bastille/files/AccountPermission.pm b/meta-security/recipes-security/bastille/files/AccountPermission.pm
similarity index 100%
rename from import-layers/meta-security/recipes-security/bastille/files/AccountPermission.pm
rename to meta-security/recipes-security/bastille/files/AccountPermission.pm
diff --git a/import-layers/meta-security/recipes-security/bastille/files/FileContent.pm b/meta-security/recipes-security/bastille/files/FileContent.pm
similarity index 100%
rename from import-layers/meta-security/recipes-security/bastille/files/FileContent.pm
rename to meta-security/recipes-security/bastille/files/FileContent.pm
diff --git a/import-layers/meta-security/recipes-security/bastille/files/HPSpecific.pm b/meta-security/recipes-security/bastille/files/HPSpecific.pm
similarity index 100%
rename from import-layers/meta-security/recipes-security/bastille/files/HPSpecific.pm
rename to meta-security/recipes-security/bastille/files/HPSpecific.pm
diff --git a/import-layers/meta-security/recipes-security/bastille/files/Miscellaneous.pm b/meta-security/recipes-security/bastille/files/Miscellaneous.pm
similarity index 100%
rename from import-layers/meta-security/recipes-security/bastille/files/Miscellaneous.pm
rename to meta-security/recipes-security/bastille/files/Miscellaneous.pm
diff --git a/import-layers/meta-security/recipes-security/bastille/files/ServiceAdmin.pm b/meta-security/recipes-security/bastille/files/ServiceAdmin.pm
similarity index 100%
rename from import-layers/meta-security/recipes-security/bastille/files/ServiceAdmin.pm
rename to meta-security/recipes-security/bastille/files/ServiceAdmin.pm
diff --git a/import-layers/meta-security/recipes-security/bastille/files/accept_os_flag_in_backend.patch b/meta-security/recipes-security/bastille/files/accept_os_flag_in_backend.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/bastille/files/accept_os_flag_in_backend.patch
rename to meta-security/recipes-security/bastille/files/accept_os_flag_in_backend.patch
diff --git a/import-layers/meta-security/recipes-security/bastille/files/allow_os_with_assess.patch b/meta-security/recipes-security/bastille/files/allow_os_with_assess.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/bastille/files/allow_os_with_assess.patch
rename to meta-security/recipes-security/bastille/files/allow_os_with_assess.patch
diff --git a/import-layers/meta-security/recipes-security/bastille/files/call_output_config.patch b/meta-security/recipes-security/bastille/files/call_output_config.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/bastille/files/call_output_config.patch
rename to meta-security/recipes-security/bastille/files/call_output_config.patch
diff --git a/import-layers/meta-security/recipes-security/bastille/files/config b/meta-security/recipes-security/bastille/files/config
similarity index 100%
rename from import-layers/meta-security/recipes-security/bastille/files/config
rename to meta-security/recipes-security/bastille/files/config
diff --git a/import-layers/meta-security/recipes-security/bastille/files/do_not_apply_config.patch b/meta-security/recipes-security/bastille/files/do_not_apply_config.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/bastille/files/do_not_apply_config.patch
rename to meta-security/recipes-security/bastille/files/do_not_apply_config.patch
diff --git a/import-layers/meta-security/recipes-security/bastille/files/edit_usage_message.patch b/meta-security/recipes-security/bastille/files/edit_usage_message.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/bastille/files/edit_usage_message.patch
rename to meta-security/recipes-security/bastille/files/edit_usage_message.patch
diff --git a/import-layers/meta-security/recipes-security/bastille/files/find_existing_config.patch b/meta-security/recipes-security/bastille/files/find_existing_config.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/bastille/files/find_existing_config.patch
rename to meta-security/recipes-security/bastille/files/find_existing_config.patch
diff --git a/import-layers/meta-security/recipes-security/bastille/files/fix_missing_use_directives.patch b/meta-security/recipes-security/bastille/files/fix_missing_use_directives.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/bastille/files/fix_missing_use_directives.patch
rename to meta-security/recipes-security/bastille/files/fix_missing_use_directives.patch
diff --git a/import-layers/meta-security/recipes-security/bastille/files/fix_number_of_modules.patch b/meta-security/recipes-security/bastille/files/fix_number_of_modules.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/bastille/files/fix_number_of_modules.patch
rename to meta-security/recipes-security/bastille/files/fix_number_of_modules.patch
diff --git a/import-layers/meta-security/recipes-security/bastille/files/fix_version_parse.patch b/meta-security/recipes-security/bastille/files/fix_version_parse.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/bastille/files/fix_version_parse.patch
rename to meta-security/recipes-security/bastille/files/fix_version_parse.patch
diff --git a/import-layers/meta-security/recipes-security/bastille/files/fixed_defined_warnings.patch b/meta-security/recipes-security/bastille/files/fixed_defined_warnings.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/bastille/files/fixed_defined_warnings.patch
rename to meta-security/recipes-security/bastille/files/fixed_defined_warnings.patch
diff --git a/import-layers/meta-security/recipes-security/bastille/files/organize_distro_discovery.patch b/meta-security/recipes-security/bastille/files/organize_distro_discovery.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/bastille/files/organize_distro_discovery.patch
rename to meta-security/recipes-security/bastille/files/organize_distro_discovery.patch
diff --git a/import-layers/meta-security/recipes-security/bastille/files/remove_questions_text_file_references.patch b/meta-security/recipes-security/bastille/files/remove_questions_text_file_references.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/bastille/files/remove_questions_text_file_references.patch
rename to meta-security/recipes-security/bastille/files/remove_questions_text_file_references.patch
diff --git a/import-layers/meta-security/recipes-security/bastille/files/set_required_questions.py b/meta-security/recipes-security/bastille/files/set_required_questions.py
similarity index 100%
rename from import-layers/meta-security/recipes-security/bastille/files/set_required_questions.py
rename to meta-security/recipes-security/bastille/files/set_required_questions.py
diff --git a/import-layers/meta-security/recipes-security/bastille/files/simplify_B_place.patch b/meta-security/recipes-security/bastille/files/simplify_B_place.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/bastille/files/simplify_B_place.patch
rename to meta-security/recipes-security/bastille/files/simplify_B_place.patch
diff --git a/import-layers/meta-security/recipes-security/bastille/files/upgrade_options_processing.patch b/meta-security/recipes-security/bastille/files/upgrade_options_processing.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/bastille/files/upgrade_options_processing.patch
rename to meta-security/recipes-security/bastille/files/upgrade_options_processing.patch
diff --git a/import-layers/meta-security/recipes-security/buck-security/buck-security_0.7.bb b/meta-security/recipes-security/buck-security/buck-security_0.7.bb
similarity index 100%
rename from import-layers/meta-security/recipes-security/buck-security/buck-security_0.7.bb
rename to meta-security/recipes-security/buck-security/buck-security_0.7.bb
diff --git a/import-layers/meta-security/recipes-security/ccs-tools/README b/meta-security/recipes-security/ccs-tools/README
similarity index 100%
rename from import-layers/meta-security/recipes-security/ccs-tools/README
rename to meta-security/recipes-security/ccs-tools/README
diff --git a/import-layers/meta-security/recipes-security/ccs-tools/ccs-tools_1.8.4.bb b/meta-security/recipes-security/ccs-tools/ccs-tools_1.8.4.bb
similarity index 100%
rename from import-layers/meta-security/recipes-security/ccs-tools/ccs-tools_1.8.4.bb
rename to meta-security/recipes-security/ccs-tools/ccs-tools_1.8.4.bb
diff --git a/import-layers/meta-security/recipes-security/checksec/checksec_1.5.bb b/meta-security/recipes-security/checksec/checksec_1.5.bb
similarity index 100%
rename from import-layers/meta-security/recipes-security/checksec/checksec_1.5.bb
rename to meta-security/recipes-security/checksec/checksec_1.5.bb
diff --git a/import-layers/meta-security/recipes-security/checksec/files/checksec.sh b/meta-security/recipes-security/checksec/files/checksec.sh
similarity index 100%
rename from import-layers/meta-security/recipes-security/checksec/files/checksec.sh
rename to meta-security/recipes-security/checksec/files/checksec.sh
diff --git a/import-layers/meta-security/recipes-security/checksecurity/checksecurity_2.0.15.bb b/meta-security/recipes-security/checksecurity/checksecurity_2.0.15.bb
similarity index 100%
rename from import-layers/meta-security/recipes-security/checksecurity/checksecurity_2.0.15.bb
rename to meta-security/recipes-security/checksecurity/checksecurity_2.0.15.bb
diff --git a/import-layers/meta-security/recipes-security/checksecurity/files/setuid-log-folder.patch b/meta-security/recipes-security/checksecurity/files/setuid-log-folder.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/checksecurity/files/setuid-log-folder.patch
rename to meta-security/recipes-security/checksecurity/files/setuid-log-folder.patch
diff --git a/import-layers/meta-security/recipes-security/clamav/clamav_0.99.3.bb b/meta-security/recipes-security/clamav/clamav_0.99.3.bb
similarity index 100%
rename from import-layers/meta-security/recipes-security/clamav/clamav_0.99.3.bb
rename to meta-security/recipes-security/clamav/clamav_0.99.3.bb
diff --git a/import-layers/meta-security/recipes-security/clamav/files/clamav-freshclam.service b/meta-security/recipes-security/clamav/files/clamav-freshclam.service
similarity index 100%
rename from import-layers/meta-security/recipes-security/clamav/files/clamav-freshclam.service
rename to meta-security/recipes-security/clamav/files/clamav-freshclam.service
diff --git a/import-layers/meta-security/recipes-security/clamav/files/clamav-milter.conf.sample b/meta-security/recipes-security/clamav/files/clamav-milter.conf.sample
similarity index 100%
rename from import-layers/meta-security/recipes-security/clamav/files/clamav-milter.conf.sample
rename to meta-security/recipes-security/clamav/files/clamav-milter.conf.sample
diff --git a/import-layers/meta-security/recipes-security/clamav/files/clamav.service b/meta-security/recipes-security/clamav/files/clamav.service
similarity index 100%
rename from import-layers/meta-security/recipes-security/clamav/files/clamav.service
rename to meta-security/recipes-security/clamav/files/clamav.service
diff --git a/import-layers/meta-security/recipes-security/clamav/files/clamd.conf b/meta-security/recipes-security/clamav/files/clamd.conf
similarity index 100%
rename from import-layers/meta-security/recipes-security/clamav/files/clamd.conf
rename to meta-security/recipes-security/clamav/files/clamd.conf
diff --git a/import-layers/meta-security/recipes-security/clamav/files/freshclam.conf b/meta-security/recipes-security/clamav/files/freshclam.conf
similarity index 100%
rename from import-layers/meta-security/recipes-security/clamav/files/freshclam.conf
rename to meta-security/recipes-security/clamav/files/freshclam.conf
diff --git a/import-layers/meta-security/recipes-security/clamav/files/volatiles.03_clamav b/meta-security/recipes-security/clamav/files/volatiles.03_clamav
similarity index 100%
rename from import-layers/meta-security/recipes-security/clamav/files/volatiles.03_clamav
rename to meta-security/recipes-security/clamav/files/volatiles.03_clamav
diff --git a/import-layers/meta-security/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb b/meta-security/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb
similarity index 100%
rename from import-layers/meta-security/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb
rename to meta-security/recipes-security/ecryptfs-utils/ecryptfs-utils_111.bb
diff --git a/import-layers/meta-security/recipes-security/ecryptfs-utils/files/ecryptfs-utils-CVE-2016-6224.patch b/meta-security/recipes-security/ecryptfs-utils/files/ecryptfs-utils-CVE-2016-6224.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/ecryptfs-utils/files/ecryptfs-utils-CVE-2016-6224.patch
rename to meta-security/recipes-security/ecryptfs-utils/files/ecryptfs-utils-CVE-2016-6224.patch
diff --git a/import-layers/meta-security/recipes-security/ecryptfs-utils/files/ecryptfs.service b/meta-security/recipes-security/ecryptfs-utils/files/ecryptfs.service
similarity index 100%
rename from import-layers/meta-security/recipes-security/ecryptfs-utils/files/ecryptfs.service
rename to meta-security/recipes-security/ecryptfs-utils/files/ecryptfs.service
diff --git a/import-layers/meta-security/recipes-security/fail2ban/fail2ban_0.10.2.bb b/meta-security/recipes-security/fail2ban/fail2ban_0.10.2.bb
similarity index 100%
rename from import-layers/meta-security/recipes-security/fail2ban/fail2ban_0.10.2.bb
rename to meta-security/recipes-security/fail2ban/fail2ban_0.10.2.bb
diff --git a/import-layers/meta-security/recipes-security/fail2ban/files/fail2ban_setup.py b/meta-security/recipes-security/fail2ban/files/fail2ban_setup.py
similarity index 100%
rename from import-layers/meta-security/recipes-security/fail2ban/files/fail2ban_setup.py
rename to meta-security/recipes-security/fail2ban/files/fail2ban_setup.py
diff --git a/import-layers/meta-security/recipes-security/fail2ban/files/initd b/meta-security/recipes-security/fail2ban/files/initd
similarity index 100%
rename from import-layers/meta-security/recipes-security/fail2ban/files/initd
rename to meta-security/recipes-security/fail2ban/files/initd
diff --git a/import-layers/meta-security/recipes-security/fscryptctl/fscryptctl_0.1.0.bb b/meta-security/recipes-security/fscryptctl/fscryptctl_0.1.0.bb
similarity index 100%
rename from import-layers/meta-security/recipes-security/fscryptctl/fscryptctl_0.1.0.bb
rename to meta-security/recipes-security/fscryptctl/fscryptctl_0.1.0.bb
diff --git a/import-layers/meta-security/recipes-security/google-authenticator-libpam/google-authenticator-libpam_1.05.bb b/meta-security/recipes-security/google-authenticator-libpam/google-authenticator-libpam_1.05.bb
similarity index 100%
rename from import-layers/meta-security/recipes-security/google-authenticator-libpam/google-authenticator-libpam_1.05.bb
rename to meta-security/recipes-security/google-authenticator-libpam/google-authenticator-libpam_1.05.bb
diff --git a/import-layers/meta-security/recipes-security/images/security-build-image.bb b/meta-security/recipes-security/images/security-build-image.bb
similarity index 100%
rename from import-layers/meta-security/recipes-security/images/security-build-image.bb
rename to meta-security/recipes-security/images/security-build-image.bb
diff --git a/import-layers/meta-security/recipes-security/images/security-client-image.bb b/meta-security/recipes-security/images/security-client-image.bb
similarity index 100%
rename from import-layers/meta-security/recipes-security/images/security-client-image.bb
rename to meta-security/recipes-security/images/security-client-image.bb
diff --git a/import-layers/meta-security/recipes-security/images/security-server-image.bb b/meta-security/recipes-security/images/security-server-image.bb
similarity index 100%
rename from import-layers/meta-security/recipes-security/images/security-server-image.bb
rename to meta-security/recipes-security/images/security-server-image.bb
diff --git a/import-layers/meta-security/recipes-security/isic/files/configure_fix.patch b/meta-security/recipes-security/isic/files/configure_fix.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/isic/files/configure_fix.patch
rename to meta-security/recipes-security/isic/files/configure_fix.patch
diff --git a/import-layers/meta-security/recipes-security/isic/files/isic-0.07-make.patch b/meta-security/recipes-security/isic/files/isic-0.07-make.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/isic/files/isic-0.07-make.patch
rename to meta-security/recipes-security/isic/files/isic-0.07-make.patch
diff --git a/import-layers/meta-security/recipes-security/isic/files/isic-0.07-netinet.patch b/meta-security/recipes-security/isic/files/isic-0.07-netinet.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/isic/files/isic-0.07-netinet.patch
rename to meta-security/recipes-security/isic/files/isic-0.07-netinet.patch
diff --git a/import-layers/meta-security/recipes-security/isic/isic_0.07.bb b/meta-security/recipes-security/isic/isic_0.07.bb
similarity index 100%
rename from import-layers/meta-security/recipes-security/isic/isic_0.07.bb
rename to meta-security/recipes-security/isic/isic_0.07.bb
diff --git a/import-layers/meta-security/recipes-security/keynote/keynote-2.3/configure-remove-hardcode-path.patch b/meta-security/recipes-security/keynote/keynote-2.3/configure-remove-hardcode-path.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/keynote/keynote-2.3/configure-remove-hardcode-path.patch
rename to meta-security/recipes-security/keynote/keynote-2.3/configure-remove-hardcode-path.patch
diff --git a/import-layers/meta-security/recipes-security/keynote/keynote-2.3/makefile-add-ldflags.patch b/meta-security/recipes-security/keynote/keynote-2.3/makefile-add-ldflags.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/keynote/keynote-2.3/makefile-add-ldflags.patch
rename to meta-security/recipes-security/keynote/keynote-2.3/makefile-add-ldflags.patch
diff --git a/import-layers/meta-security/recipes-security/keynote/keynote-2.3/run-ptest b/meta-security/recipes-security/keynote/keynote-2.3/run-ptest
similarity index 100%
rename from import-layers/meta-security/recipes-security/keynote/keynote-2.3/run-ptest
rename to meta-security/recipes-security/keynote/keynote-2.3/run-ptest
diff --git a/import-layers/meta-security/recipes-security/keynote/keynote_2.3.bb b/meta-security/recipes-security/keynote/keynote_2.3.bb
similarity index 100%
rename from import-layers/meta-security/recipes-security/keynote/keynote_2.3.bb
rename to meta-security/recipes-security/keynote/keynote_2.3.bb
diff --git a/import-layers/meta-security/recipes-security/keyutils/files/keyutils-fix-error-report-by-adding-default-message.patch b/meta-security/recipes-security/keyutils/files/keyutils-fix-error-report-by-adding-default-message.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/keyutils/files/keyutils-fix-error-report-by-adding-default-message.patch
rename to meta-security/recipes-security/keyutils/files/keyutils-fix-error-report-by-adding-default-message.patch
diff --git a/import-layers/meta-security/recipes-security/keyutils/files/keyutils-test-fix-output-format.patch b/meta-security/recipes-security/keyutils/files/keyutils-test-fix-output-format.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/keyutils/files/keyutils-test-fix-output-format.patch
rename to meta-security/recipes-security/keyutils/files/keyutils-test-fix-output-format.patch
diff --git a/import-layers/meta-security/recipes-security/keyutils/files/keyutils-use-relative-path-for-link.patch b/meta-security/recipes-security/keyutils/files/keyutils-use-relative-path-for-link.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/keyutils/files/keyutils-use-relative-path-for-link.patch
rename to meta-security/recipes-security/keyutils/files/keyutils-use-relative-path-for-link.patch
diff --git a/import-layers/meta-security/recipes-security/keyutils/files/run-ptest b/meta-security/recipes-security/keyutils/files/run-ptest
similarity index 100%
rename from import-layers/meta-security/recipes-security/keyutils/files/run-ptest
rename to meta-security/recipes-security/keyutils/files/run-ptest
diff --git a/import-layers/meta-security/recipes-security/keyutils/keyutils_1.5.10.bb b/meta-security/recipes-security/keyutils/keyutils_1.5.10.bb
similarity index 100%
rename from import-layers/meta-security/recipes-security/keyutils/keyutils_1.5.10.bb
rename to meta-security/recipes-security/keyutils/keyutils_1.5.10.bb
diff --git a/import-layers/meta-security/recipes-security/libdhash/ding-libs_0.5.0.bb b/meta-security/recipes-security/libdhash/ding-libs_0.5.0.bb
similarity index 100%
rename from import-layers/meta-security/recipes-security/libdhash/ding-libs_0.5.0.bb
rename to meta-security/recipes-security/libdhash/ding-libs_0.5.0.bb
diff --git a/import-layers/meta-security/recipes-security/libgssglue/files/libgssglue-canon-name.patch b/meta-security/recipes-security/libgssglue/files/libgssglue-canon-name.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/libgssglue/files/libgssglue-canon-name.patch
rename to meta-security/recipes-security/libgssglue/files/libgssglue-canon-name.patch
diff --git a/import-layers/meta-security/recipes-security/libgssglue/files/libgssglue-fix-CVE-2011-2709.patch b/meta-security/recipes-security/libgssglue/files/libgssglue-fix-CVE-2011-2709.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/libgssglue/files/libgssglue-fix-CVE-2011-2709.patch
rename to meta-security/recipes-security/libgssglue/files/libgssglue-fix-CVE-2011-2709.patch
diff --git a/import-layers/meta-security/recipes-security/libgssglue/files/libgssglue-g-initialize.patch b/meta-security/recipes-security/libgssglue/files/libgssglue-g-initialize.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/libgssglue/files/libgssglue-g-initialize.patch
rename to meta-security/recipes-security/libgssglue/files/libgssglue-g-initialize.patch
diff --git a/import-layers/meta-security/recipes-security/libgssglue/files/libgssglue-gss-inq-cred.patch b/meta-security/recipes-security/libgssglue/files/libgssglue-gss-inq-cred.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/libgssglue/files/libgssglue-gss-inq-cred.patch
rename to meta-security/recipes-security/libgssglue/files/libgssglue-gss-inq-cred.patch
diff --git a/import-layers/meta-security/recipes-security/libgssglue/files/libgssglue-mglueP.patch b/meta-security/recipes-security/libgssglue/files/libgssglue-mglueP.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/libgssglue/files/libgssglue-mglueP.patch
rename to meta-security/recipes-security/libgssglue/files/libgssglue-mglueP.patch
diff --git a/import-layers/meta-security/recipes-security/libgssglue/libgssglue_0.4.bb b/meta-security/recipes-security/libgssglue/libgssglue_0.4.bb
similarity index 100%
rename from import-layers/meta-security/recipes-security/libgssglue/libgssglue_0.4.bb
rename to meta-security/recipes-security/libgssglue/libgssglue_0.4.bb
diff --git a/import-layers/meta-security/recipes-security/libmhash/files/Makefile.test b/meta-security/recipes-security/libmhash/files/Makefile.test
similarity index 100%
rename from import-layers/meta-security/recipes-security/libmhash/files/Makefile.test
rename to meta-security/recipes-security/libmhash/files/Makefile.test
diff --git a/import-layers/meta-security/recipes-security/libmhash/files/mhash.c b/meta-security/recipes-security/libmhash/files/mhash.c
similarity index 100%
rename from import-layers/meta-security/recipes-security/libmhash/files/mhash.c
rename to meta-security/recipes-security/libmhash/files/mhash.c
diff --git a/import-layers/meta-security/recipes-security/libmhash/files/run-ptest b/meta-security/recipes-security/libmhash/files/run-ptest
similarity index 100%
rename from import-layers/meta-security/recipes-security/libmhash/files/run-ptest
rename to meta-security/recipes-security/libmhash/files/run-ptest
diff --git a/import-layers/meta-security/recipes-security/libmhash/libmhash_0.9.9.9.bb b/meta-security/recipes-security/libmhash/libmhash_0.9.9.9.bb
similarity index 100%
rename from import-layers/meta-security/recipes-security/libmhash/libmhash_0.9.9.9.bb
rename to meta-security/recipes-security/libmhash/libmhash_0.9.9.9.bb
diff --git a/import-layers/meta-security/recipes-security/libmspack/libmspack_0.5.bb b/meta-security/recipes-security/libmspack/libmspack_0.5.bb
similarity index 100%
rename from import-layers/meta-security/recipes-security/libmspack/libmspack_0.5.bb
rename to meta-security/recipes-security/libmspack/libmspack_0.5.bb
diff --git a/import-layers/meta-security/recipes-security/libseccomp/files/run-ptest b/meta-security/recipes-security/libseccomp/files/run-ptest
similarity index 100%
rename from import-layers/meta-security/recipes-security/libseccomp/files/run-ptest
rename to meta-security/recipes-security/libseccomp/files/run-ptest
diff --git a/import-layers/meta-security/recipes-security/libseccomp/libseccomp_2.3.3.bb b/meta-security/recipes-security/libseccomp/libseccomp_2.3.3.bb
similarity index 100%
rename from import-layers/meta-security/recipes-security/libseccomp/libseccomp_2.3.3.bb
rename to meta-security/recipes-security/libseccomp/libseccomp_2.3.3.bb
diff --git a/import-layers/meta-security/recipes-security/nikto/files/CVE-2018-11652.patch b/meta-security/recipes-security/nikto/files/CVE-2018-11652.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/nikto/files/CVE-2018-11652.patch
rename to meta-security/recipes-security/nikto/files/CVE-2018-11652.patch
diff --git a/import-layers/meta-security/recipes-security/nikto/files/location.patch b/meta-security/recipes-security/nikto/files/location.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/nikto/files/location.patch
rename to meta-security/recipes-security/nikto/files/location.patch
diff --git a/import-layers/meta-security/recipes-security/nikto/nikto_2.1.5.bb b/meta-security/recipes-security/nikto/nikto_2.1.5.bb
similarity index 100%
rename from import-layers/meta-security/recipes-security/nikto/nikto_2.1.5.bb
rename to meta-security/recipes-security/nikto/nikto_2.1.5.bb
diff --git a/import-layers/meta-security/recipes-security/nmap/files/nmap-redefine-the-python-library-dir.patch b/meta-security/recipes-security/nmap/files/nmap-redefine-the-python-library-dir.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/nmap/files/nmap-redefine-the-python-library-dir.patch
rename to meta-security/recipes-security/nmap/files/nmap-redefine-the-python-library-dir.patch
diff --git a/import-layers/meta-security/recipes-security/nmap/files/nmap-replace-shtool-mkdir-with-coreutils-mkdir-command.patch b/meta-security/recipes-security/nmap/files/nmap-replace-shtool-mkdir-with-coreutils-mkdir-command.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/nmap/files/nmap-replace-shtool-mkdir-with-coreutils-mkdir-command.patch
rename to meta-security/recipes-security/nmap/files/nmap-replace-shtool-mkdir-with-coreutils-mkdir-command.patch
diff --git a/import-layers/meta-security/recipes-security/nmap/nmap_7.60.bb b/meta-security/recipes-security/nmap/nmap_7.60.bb
similarity index 100%
rename from import-layers/meta-security/recipes-security/nmap/nmap_7.60.bb
rename to meta-security/recipes-security/nmap/nmap_7.60.bb
diff --git a/import-layers/meta-security/recipes-security/packagegroup/packagegroup-core-security.bb b/meta-security/recipes-security/packagegroup/packagegroup-core-security.bb
similarity index 100%
rename from import-layers/meta-security/recipes-security/packagegroup/packagegroup-core-security.bb
rename to meta-security/recipes-security/packagegroup/packagegroup-core-security.bb
diff --git a/import-layers/meta-security/recipes-security/paxctl/paxctl_0.9.bb b/meta-security/recipes-security/paxctl/paxctl_0.9.bb
similarity index 100%
rename from import-layers/meta-security/recipes-security/paxctl/paxctl_0.9.bb
rename to meta-security/recipes-security/paxctl/paxctl_0.9.bb
diff --git a/import-layers/meta-security/recipes-security/redhat-security/files/find-chroot-py.sh b/meta-security/recipes-security/redhat-security/files/find-chroot-py.sh
similarity index 100%
rename from import-layers/meta-security/recipes-security/redhat-security/files/find-chroot-py.sh
rename to meta-security/recipes-security/redhat-security/files/find-chroot-py.sh
diff --git a/import-layers/meta-security/recipes-security/redhat-security/files/find-chroot.sh b/meta-security/recipes-security/redhat-security/files/find-chroot.sh
similarity index 100%
rename from import-layers/meta-security/recipes-security/redhat-security/files/find-chroot.sh
rename to meta-security/recipes-security/redhat-security/files/find-chroot.sh
diff --git a/import-layers/meta-security/recipes-security/redhat-security/files/find-elf4tmp.sh b/meta-security/recipes-security/redhat-security/files/find-elf4tmp.sh
similarity index 100%
rename from import-layers/meta-security/recipes-security/redhat-security/files/find-elf4tmp.sh
rename to meta-security/recipes-security/redhat-security/files/find-elf4tmp.sh
diff --git a/import-layers/meta-security/recipes-security/redhat-security/files/find-execstack.sh b/meta-security/recipes-security/redhat-security/files/find-execstack.sh
similarity index 100%
rename from import-layers/meta-security/recipes-security/redhat-security/files/find-execstack.sh
rename to meta-security/recipes-security/redhat-security/files/find-execstack.sh
diff --git a/import-layers/meta-security/recipes-security/redhat-security/files/find-hidden-exec.sh b/meta-security/recipes-security/redhat-security/files/find-hidden-exec.sh
similarity index 100%
rename from import-layers/meta-security/recipes-security/redhat-security/files/find-hidden-exec.sh
rename to meta-security/recipes-security/redhat-security/files/find-hidden-exec.sh
diff --git a/import-layers/meta-security/recipes-security/redhat-security/files/find-nodrop-groups.sh b/meta-security/recipes-security/redhat-security/files/find-nodrop-groups.sh
similarity index 100%
rename from import-layers/meta-security/recipes-security/redhat-security/files/find-nodrop-groups.sh
rename to meta-security/recipes-security/redhat-security/files/find-nodrop-groups.sh
diff --git a/import-layers/meta-security/recipes-security/redhat-security/files/find-sh4errors.sh b/meta-security/recipes-security/redhat-security/files/find-sh4errors.sh
similarity index 100%
rename from import-layers/meta-security/recipes-security/redhat-security/files/find-sh4errors.sh
rename to meta-security/recipes-security/redhat-security/files/find-sh4errors.sh
diff --git a/import-layers/meta-security/recipes-security/redhat-security/files/find-sh4tmp.sh b/meta-security/recipes-security/redhat-security/files/find-sh4tmp.sh
similarity index 100%
rename from import-layers/meta-security/recipes-security/redhat-security/files/find-sh4tmp.sh
rename to meta-security/recipes-security/redhat-security/files/find-sh4tmp.sh
diff --git a/import-layers/meta-security/recipes-security/redhat-security/files/lib-bin-check.sh b/meta-security/recipes-security/redhat-security/files/lib-bin-check.sh
similarity index 100%
rename from import-layers/meta-security/recipes-security/redhat-security/files/lib-bin-check.sh
rename to meta-security/recipes-security/redhat-security/files/lib-bin-check.sh
diff --git a/import-layers/meta-security/recipes-security/redhat-security/files/rpm-chksec.sh b/meta-security/recipes-security/redhat-security/files/rpm-chksec.sh
similarity index 100%
rename from import-layers/meta-security/recipes-security/redhat-security/files/rpm-chksec.sh
rename to meta-security/recipes-security/redhat-security/files/rpm-chksec.sh
diff --git a/import-layers/meta-security/recipes-security/redhat-security/files/rpm-drop-groups.sh b/meta-security/recipes-security/redhat-security/files/rpm-drop-groups.sh
similarity index 100%
rename from import-layers/meta-security/recipes-security/redhat-security/files/rpm-drop-groups.sh
rename to meta-security/recipes-security/redhat-security/files/rpm-drop-groups.sh
diff --git a/import-layers/meta-security/recipes-security/redhat-security/files/selinux-check-devices.sh b/meta-security/recipes-security/redhat-security/files/selinux-check-devices.sh
similarity index 100%
rename from import-layers/meta-security/recipes-security/redhat-security/files/selinux-check-devices.sh
rename to meta-security/recipes-security/redhat-security/files/selinux-check-devices.sh
diff --git a/import-layers/meta-security/recipes-security/redhat-security/files/selinux-ls-unconfined.sh b/meta-security/recipes-security/redhat-security/files/selinux-ls-unconfined.sh
similarity index 100%
rename from import-layers/meta-security/recipes-security/redhat-security/files/selinux-ls-unconfined.sh
rename to meta-security/recipes-security/redhat-security/files/selinux-ls-unconfined.sh
diff --git a/import-layers/meta-security/recipes-security/redhat-security/redhat-security_1.0.bb b/meta-security/recipes-security/redhat-security/redhat-security_1.0.bb
similarity index 100%
rename from import-layers/meta-security/recipes-security/redhat-security/redhat-security_1.0.bb
rename to meta-security/recipes-security/redhat-security/redhat-security_1.0.bb
diff --git a/import-layers/meta-security/recipes-security/samhain/files/run-ptest b/meta-security/recipes-security/samhain/files/run-ptest
similarity index 100%
rename from import-layers/meta-security/recipes-security/samhain/files/run-ptest
rename to meta-security/recipes-security/samhain/files/run-ptest
diff --git a/import-layers/meta-security/recipes-security/samhain/files/samhain-add-LDFLAGS-variable-for-samhain_setpwd.patch b/meta-security/recipes-security/samhain/files/samhain-add-LDFLAGS-variable-for-samhain_setpwd.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/samhain/files/samhain-add-LDFLAGS-variable-for-samhain_setpwd.patch
rename to meta-security/recipes-security/samhain/files/samhain-add-LDFLAGS-variable-for-samhain_setpwd.patch
diff --git a/import-layers/meta-security/recipes-security/samhain/files/samhain-avoid-searching-host-for-postgresql.patch b/meta-security/recipes-security/samhain/files/samhain-avoid-searching-host-for-postgresql.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/samhain/files/samhain-avoid-searching-host-for-postgresql.patch
rename to meta-security/recipes-security/samhain/files/samhain-avoid-searching-host-for-postgresql.patch
diff --git a/import-layers/meta-security/recipes-security/samhain/files/samhain-client.default b/meta-security/recipes-security/samhain/files/samhain-client.default
similarity index 100%
rename from import-layers/meta-security/recipes-security/samhain/files/samhain-client.default
rename to meta-security/recipes-security/samhain/files/samhain-client.default
diff --git a/import-layers/meta-security/recipes-security/samhain/files/samhain-client.init b/meta-security/recipes-security/samhain/files/samhain-client.init
similarity index 100%
rename from import-layers/meta-security/recipes-security/samhain/files/samhain-client.init
rename to meta-security/recipes-security/samhain/files/samhain-client.init
diff --git a/import-layers/meta-security/recipes-security/samhain/files/samhain-configure-add-option-for-ps.patch b/meta-security/recipes-security/samhain/files/samhain-configure-add-option-for-ps.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/samhain/files/samhain-configure-add-option-for-ps.patch
rename to meta-security/recipes-security/samhain/files/samhain-configure-add-option-for-ps.patch
diff --git a/import-layers/meta-security/recipes-security/samhain/files/samhain-cross-compile.patch b/meta-security/recipes-security/samhain/files/samhain-cross-compile.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/samhain/files/samhain-cross-compile.patch
rename to meta-security/recipes-security/samhain/files/samhain-cross-compile.patch
diff --git a/import-layers/meta-security/recipes-security/samhain/files/samhain-mips64-aarch64-dnmalloc-hash-fix.patch b/meta-security/recipes-security/samhain/files/samhain-mips64-aarch64-dnmalloc-hash-fix.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/samhain/files/samhain-mips64-aarch64-dnmalloc-hash-fix.patch
rename to meta-security/recipes-security/samhain/files/samhain-mips64-aarch64-dnmalloc-hash-fix.patch
diff --git a/import-layers/meta-security/recipes-security/samhain/files/samhain-not-run-ptest-on-host.patch b/meta-security/recipes-security/samhain/files/samhain-not-run-ptest-on-host.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/samhain/files/samhain-not-run-ptest-on-host.patch
rename to meta-security/recipes-security/samhain/files/samhain-not-run-ptest-on-host.patch
diff --git a/import-layers/meta-security/recipes-security/samhain/files/samhain-pid-path.patch b/meta-security/recipes-security/samhain/files/samhain-pid-path.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/samhain/files/samhain-pid-path.patch
rename to meta-security/recipes-security/samhain/files/samhain-pid-path.patch
diff --git a/import-layers/meta-security/recipes-security/samhain/files/samhain-samhainrc-fix-files-dirs-path.patch b/meta-security/recipes-security/samhain/files/samhain-samhainrc-fix-files-dirs-path.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/samhain/files/samhain-samhainrc-fix-files-dirs-path.patch
rename to meta-security/recipes-security/samhain/files/samhain-samhainrc-fix-files-dirs-path.patch
diff --git a/import-layers/meta-security/recipes-security/samhain/files/samhain-samhainrc.patch b/meta-security/recipes-security/samhain/files/samhain-samhainrc.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/samhain/files/samhain-samhainrc.patch
rename to meta-security/recipes-security/samhain/files/samhain-samhainrc.patch
diff --git a/import-layers/meta-security/recipes-security/samhain/files/samhain-server-volatiles b/meta-security/recipes-security/samhain/files/samhain-server-volatiles
similarity index 100%
rename from import-layers/meta-security/recipes-security/samhain/files/samhain-server-volatiles
rename to meta-security/recipes-security/samhain/files/samhain-server-volatiles
diff --git a/import-layers/meta-security/recipes-security/samhain/files/samhain-server.default b/meta-security/recipes-security/samhain/files/samhain-server.default
similarity index 100%
rename from import-layers/meta-security/recipes-security/samhain/files/samhain-server.default
rename to meta-security/recipes-security/samhain/files/samhain-server.default
diff --git a/import-layers/meta-security/recipes-security/samhain/files/samhain-server.init b/meta-security/recipes-security/samhain/files/samhain-server.init
similarity index 100%
rename from import-layers/meta-security/recipes-security/samhain/files/samhain-server.init
rename to meta-security/recipes-security/samhain/files/samhain-server.init
diff --git a/import-layers/meta-security/recipes-security/samhain/files/samhain-sha256-big-endian.patch b/meta-security/recipes-security/samhain/files/samhain-sha256-big-endian.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/samhain/files/samhain-sha256-big-endian.patch
rename to meta-security/recipes-security/samhain/files/samhain-sha256-big-endian.patch
diff --git a/import-layers/meta-security/recipes-security/samhain/files/samhain-standalone.default b/meta-security/recipes-security/samhain/files/samhain-standalone.default
similarity index 100%
rename from import-layers/meta-security/recipes-security/samhain/files/samhain-standalone.default
rename to meta-security/recipes-security/samhain/files/samhain-standalone.default
diff --git a/import-layers/meta-security/recipes-security/samhain/files/samhain-standalone.init b/meta-security/recipes-security/samhain/files/samhain-standalone.init
similarity index 100%
rename from import-layers/meta-security/recipes-security/samhain/files/samhain-standalone.init
rename to meta-security/recipes-security/samhain/files/samhain-standalone.init
diff --git a/import-layers/meta-security/recipes-security/samhain/files/samhain.service b/meta-security/recipes-security/samhain/files/samhain.service
similarity index 100%
rename from import-layers/meta-security/recipes-security/samhain/files/samhain.service
rename to meta-security/recipes-security/samhain/files/samhain.service
diff --git a/import-layers/meta-security/recipes-security/samhain/samhain-client_4.2.2.bb b/meta-security/recipes-security/samhain/samhain-client_4.2.2.bb
similarity index 100%
rename from import-layers/meta-security/recipes-security/samhain/samhain-client_4.2.2.bb
rename to meta-security/recipes-security/samhain/samhain-client_4.2.2.bb
diff --git a/import-layers/meta-security/recipes-security/samhain/samhain-server_4.2.2.bb b/meta-security/recipes-security/samhain/samhain-server_4.2.2.bb
similarity index 100%
rename from import-layers/meta-security/recipes-security/samhain/samhain-server_4.2.2.bb
rename to meta-security/recipes-security/samhain/samhain-server_4.2.2.bb
diff --git a/import-layers/meta-security/recipes-security/samhain/samhain-standalone_4.2.2.bb b/meta-security/recipes-security/samhain/samhain-standalone_4.2.2.bb
similarity index 100%
rename from import-layers/meta-security/recipes-security/samhain/samhain-standalone_4.2.2.bb
rename to meta-security/recipes-security/samhain/samhain-standalone_4.2.2.bb
diff --git a/import-layers/meta-security/recipes-security/samhain/samhain.inc b/meta-security/recipes-security/samhain/samhain.inc
similarity index 100%
rename from import-layers/meta-security/recipes-security/samhain/samhain.inc
rename to meta-security/recipes-security/samhain/samhain.inc
diff --git a/import-layers/meta-security/recipes-security/scapy/scapy/run-ptest b/meta-security/recipes-security/scapy/scapy/run-ptest
similarity index 100%
rename from import-layers/meta-security/recipes-security/scapy/scapy/run-ptest
rename to meta-security/recipes-security/scapy/scapy/run-ptest
diff --git a/import-layers/meta-security/recipes-security/scapy/scapy_2.3.3.bb b/meta-security/recipes-security/scapy/scapy_2.3.3.bb
similarity index 100%
rename from import-layers/meta-security/recipes-security/scapy/scapy_2.3.3.bb
rename to meta-security/recipes-security/scapy/scapy_2.3.3.bb
diff --git a/import-layers/meta-security/recipes-security/smack/files/run-ptest b/meta-security/recipes-security/smack/files/run-ptest
similarity index 100%
rename from import-layers/meta-security/recipes-security/smack/files/run-ptest
rename to meta-security/recipes-security/smack/files/run-ptest
diff --git a/import-layers/meta-security/recipes-security/smack/files/smack_generator_make_fixup.patch b/meta-security/recipes-security/smack/files/smack_generator_make_fixup.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/smack/files/smack_generator_make_fixup.patch
rename to meta-security/recipes-security/smack/files/smack_generator_make_fixup.patch
diff --git a/import-layers/meta-security/recipes-security/smack/smack_1.3.1.bb b/meta-security/recipes-security/smack/smack_1.3.1.bb
similarity index 100%
rename from import-layers/meta-security/recipes-security/smack/smack_1.3.1.bb
rename to meta-security/recipes-security/smack/smack_1.3.1.bb
diff --git a/import-layers/meta-security/recipes-security/sssd/files/sssd.conf b/meta-security/recipes-security/sssd/files/sssd.conf
similarity index 100%
rename from import-layers/meta-security/recipes-security/sssd/files/sssd.conf
rename to meta-security/recipes-security/sssd/files/sssd.conf
diff --git a/import-layers/meta-security/recipes-security/sssd/sssd_1.16.0.bb b/meta-security/recipes-security/sssd/sssd_1.16.0.bb
similarity index 100%
rename from import-layers/meta-security/recipes-security/sssd/sssd_1.16.0.bb
rename to meta-security/recipes-security/sssd/sssd_1.16.0.bb
diff --git a/import-layers/meta-security/recipes-security/suricata/files/no_libhtp_build.patch b/meta-security/recipes-security/suricata/files/no_libhtp_build.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/suricata/files/no_libhtp_build.patch
rename to meta-security/recipes-security/suricata/files/no_libhtp_build.patch
diff --git a/import-layers/meta-security/recipes-security/suricata/files/suricata.yaml b/meta-security/recipes-security/suricata/files/suricata.yaml
similarity index 100%
rename from import-layers/meta-security/recipes-security/suricata/files/suricata.yaml
rename to meta-security/recipes-security/suricata/files/suricata.yaml
diff --git a/import-layers/meta-security/recipes-security/suricata/files/volatiles.03_suricata b/meta-security/recipes-security/suricata/files/volatiles.03_suricata
similarity index 100%
rename from import-layers/meta-security/recipes-security/suricata/files/volatiles.03_suricata
rename to meta-security/recipes-security/suricata/files/volatiles.03_suricata
diff --git a/import-layers/meta-security/recipes-security/suricata/libhtp_0.5.25.bb b/meta-security/recipes-security/suricata/libhtp_0.5.25.bb
similarity index 100%
rename from import-layers/meta-security/recipes-security/suricata/libhtp_0.5.25.bb
rename to meta-security/recipes-security/suricata/libhtp_0.5.25.bb
diff --git a/import-layers/meta-security/recipes-security/suricata/suricata.inc b/meta-security/recipes-security/suricata/suricata.inc
similarity index 100%
rename from import-layers/meta-security/recipes-security/suricata/suricata.inc
rename to meta-security/recipes-security/suricata/suricata.inc
diff --git a/import-layers/meta-security/recipes-security/suricata/suricata_4.0.0.bb b/meta-security/recipes-security/suricata/suricata_4.0.0.bb
similarity index 100%
rename from import-layers/meta-security/recipes-security/suricata/suricata_4.0.0.bb
rename to meta-security/recipes-security/suricata/suricata_4.0.0.bb
diff --git a/import-layers/meta-security/recipes-security/tripwire/files/add_armeb_arch.patch b/meta-security/recipes-security/tripwire/files/add_armeb_arch.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/tripwire/files/add_armeb_arch.patch
rename to meta-security/recipes-security/tripwire/files/add_armeb_arch.patch
diff --git a/import-layers/meta-security/recipes-security/tripwire/files/tripwire.cron b/meta-security/recipes-security/tripwire/files/tripwire.cron
similarity index 100%
rename from import-layers/meta-security/recipes-security/tripwire/files/tripwire.cron
rename to meta-security/recipes-security/tripwire/files/tripwire.cron
diff --git a/import-layers/meta-security/recipes-security/tripwire/files/tripwire.sh b/meta-security/recipes-security/tripwire/files/tripwire.sh
similarity index 100%
rename from import-layers/meta-security/recipes-security/tripwire/files/tripwire.sh
rename to meta-security/recipes-security/tripwire/files/tripwire.sh
diff --git a/import-layers/meta-security/recipes-security/tripwire/files/tripwire.txt b/meta-security/recipes-security/tripwire/files/tripwire.txt
similarity index 100%
rename from import-layers/meta-security/recipes-security/tripwire/files/tripwire.txt
rename to meta-security/recipes-security/tripwire/files/tripwire.txt
diff --git a/import-layers/meta-security/recipes-security/tripwire/files/twcfg.txt b/meta-security/recipes-security/tripwire/files/twcfg.txt
similarity index 100%
rename from import-layers/meta-security/recipes-security/tripwire/files/twcfg.txt
rename to meta-security/recipes-security/tripwire/files/twcfg.txt
diff --git a/import-layers/meta-security/recipes-security/tripwire/files/twinstall.sh b/meta-security/recipes-security/tripwire/files/twinstall.sh
similarity index 100%
rename from import-layers/meta-security/recipes-security/tripwire/files/twinstall.sh
rename to meta-security/recipes-security/tripwire/files/twinstall.sh
diff --git a/import-layers/meta-security/recipes-security/tripwire/files/twpol-yocto.txt b/meta-security/recipes-security/tripwire/files/twpol-yocto.txt
similarity index 100%
rename from import-layers/meta-security/recipes-security/tripwire/files/twpol-yocto.txt
rename to meta-security/recipes-security/tripwire/files/twpol-yocto.txt
diff --git a/import-layers/meta-security/recipes-security/tripwire/tripwire_2.4.3.6.bb b/meta-security/recipes-security/tripwire/tripwire_2.4.3.6.bb
similarity index 100%
rename from import-layers/meta-security/recipes-security/tripwire/tripwire_2.4.3.6.bb
rename to meta-security/recipes-security/tripwire/tripwire_2.4.3.6.bb
diff --git a/import-layers/meta-security/recipes-security/xmlsec1/xmlsec1/change-finding-path-of-nss.patch b/meta-security/recipes-security/xmlsec1/xmlsec1/change-finding-path-of-nss.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/xmlsec1/xmlsec1/change-finding-path-of-nss.patch
rename to meta-security/recipes-security/xmlsec1/xmlsec1/change-finding-path-of-nss.patch
diff --git a/import-layers/meta-security/recipes-security/xmlsec1/xmlsec1/fix-ltmain.sh.patch b/meta-security/recipes-security/xmlsec1/xmlsec1/fix-ltmain.sh.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/xmlsec1/xmlsec1/fix-ltmain.sh.patch
rename to meta-security/recipes-security/xmlsec1/xmlsec1/fix-ltmain.sh.patch
diff --git a/import-layers/meta-security/recipes-security/xmlsec1/xmlsec1/makefile-ptest.patch b/meta-security/recipes-security/xmlsec1/xmlsec1/makefile-ptest.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/xmlsec1/xmlsec1/makefile-ptest.patch
rename to meta-security/recipes-security/xmlsec1/xmlsec1/makefile-ptest.patch
diff --git a/import-layers/meta-security/recipes-security/xmlsec1/xmlsec1/run-ptest b/meta-security/recipes-security/xmlsec1/xmlsec1/run-ptest
similarity index 100%
rename from import-layers/meta-security/recipes-security/xmlsec1/xmlsec1/run-ptest
rename to meta-security/recipes-security/xmlsec1/xmlsec1/run-ptest
diff --git a/import-layers/meta-security/recipes-security/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch b/meta-security/recipes-security/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch
rename to meta-security/recipes-security/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch
diff --git a/import-layers/meta-security/recipes-security/xmlsec1/xmlsec1/xmlsec1-fix-a-typo-in-examples-verify3.c.patch b/meta-security/recipes-security/xmlsec1/xmlsec1/xmlsec1-fix-a-typo-in-examples-verify3.c.patch
similarity index 100%
rename from import-layers/meta-security/recipes-security/xmlsec1/xmlsec1/xmlsec1-fix-a-typo-in-examples-verify3.c.patch
rename to meta-security/recipes-security/xmlsec1/xmlsec1/xmlsec1-fix-a-typo-in-examples-verify3.c.patch
diff --git a/import-layers/meta-security/recipes-security/xmlsec1/xmlsec1_1.2.25.bb b/meta-security/recipes-security/xmlsec1/xmlsec1_1.2.25.bb
similarity index 100%
rename from import-layers/meta-security/recipes-security/xmlsec1/xmlsec1_1.2.25.bb
rename to meta-security/recipes-security/xmlsec1/xmlsec1_1.2.25.bb
diff --git a/meta-selftest b/meta-selftest
deleted file mode 120000
index 95892e6..0000000
--- a/meta-selftest
+++ /dev/null
@@ -1 +0,0 @@
-import-layers/yocto-poky/meta-selftest
\ No newline at end of file
diff --git a/meta-skeleton b/meta-skeleton
deleted file mode 120000
index 76db5d6..0000000
--- a/meta-skeleton
+++ /dev/null
@@ -1 +0,0 @@
-import-layers/yocto-poky/meta-skeleton
\ No newline at end of file
diff --git a/meta-yocto-bsp b/meta-yocto-bsp
deleted file mode 120000
index 21c3ec2..0000000
--- a/meta-yocto-bsp
+++ /dev/null
@@ -1 +0,0 @@
-import-layers/yocto-poky/meta-yocto-bsp
\ No newline at end of file
diff --git a/oe-init-build-env b/oe-init-build-env
index 0d48842..f27e0e7 120000
--- a/oe-init-build-env
+++ b/oe-init-build-env
@@ -1 +1 @@
-import-layers/yocto-poky/oe-init-build-env
\ No newline at end of file
+poky/oe-init-build-env
\ No newline at end of file
diff --git a/import-layers/yocto-poky/.gitignore b/poky/.gitignore
similarity index 100%
rename from import-layers/yocto-poky/.gitignore
rename to poky/.gitignore
diff --git a/import-layers/yocto-poky/.templateconf b/poky/.templateconf
similarity index 100%
rename from import-layers/yocto-poky/.templateconf
rename to poky/.templateconf
diff --git a/import-layers/yocto-poky/LICENSE b/poky/LICENSE
similarity index 100%
rename from import-layers/yocto-poky/LICENSE
rename to poky/LICENSE
diff --git a/import-layers/yocto-poky/README.LSB b/poky/README.LSB
similarity index 100%
rename from import-layers/yocto-poky/README.LSB
rename to poky/README.LSB
diff --git a/import-layers/yocto-poky/README.hardware b/poky/README.hardware
similarity index 100%
rename from import-layers/yocto-poky/README.hardware
rename to poky/README.hardware
diff --git a/import-layers/yocto-poky/README.poky b/poky/README.poky
similarity index 100%
rename from import-layers/yocto-poky/README.poky
rename to poky/README.poky
diff --git a/import-layers/yocto-poky/README.qemu b/poky/README.qemu
similarity index 100%
rename from import-layers/yocto-poky/README.qemu
rename to poky/README.qemu
diff --git a/import-layers/yocto-poky/bitbake/AUTHORS b/poky/bitbake/AUTHORS
similarity index 100%
rename from import-layers/yocto-poky/bitbake/AUTHORS
rename to poky/bitbake/AUTHORS
diff --git a/import-layers/yocto-poky/bitbake/COPYING b/poky/bitbake/COPYING
similarity index 100%
rename from import-layers/yocto-poky/bitbake/COPYING
rename to poky/bitbake/COPYING
diff --git a/import-layers/yocto-poky/bitbake/ChangeLog b/poky/bitbake/ChangeLog
similarity index 100%
rename from import-layers/yocto-poky/bitbake/ChangeLog
rename to poky/bitbake/ChangeLog
diff --git a/import-layers/yocto-poky/bitbake/HEADER b/poky/bitbake/HEADER
similarity index 100%
rename from import-layers/yocto-poky/bitbake/HEADER
rename to poky/bitbake/HEADER
diff --git a/import-layers/yocto-poky/bitbake/LICENSE b/poky/bitbake/LICENSE
similarity index 100%
rename from import-layers/yocto-poky/bitbake/LICENSE
rename to poky/bitbake/LICENSE
diff --git a/import-layers/yocto-poky/bitbake/README b/poky/bitbake/README
similarity index 100%
rename from import-layers/yocto-poky/bitbake/README
rename to poky/bitbake/README
diff --git a/import-layers/yocto-poky/bitbake/bin/bitbake b/poky/bitbake/bin/bitbake
similarity index 100%
rename from import-layers/yocto-poky/bitbake/bin/bitbake
rename to poky/bitbake/bin/bitbake
diff --git a/import-layers/yocto-poky/bitbake/bin/bitbake-diffsigs b/poky/bitbake/bin/bitbake-diffsigs
similarity index 100%
rename from import-layers/yocto-poky/bitbake/bin/bitbake-diffsigs
rename to poky/bitbake/bin/bitbake-diffsigs
diff --git a/import-layers/yocto-poky/bitbake/bin/bitbake-dumpsig b/poky/bitbake/bin/bitbake-dumpsig
similarity index 100%
rename from import-layers/yocto-poky/bitbake/bin/bitbake-dumpsig
rename to poky/bitbake/bin/bitbake-dumpsig
diff --git a/import-layers/yocto-poky/bitbake/bin/bitbake-layers b/poky/bitbake/bin/bitbake-layers
similarity index 100%
rename from import-layers/yocto-poky/bitbake/bin/bitbake-layers
rename to poky/bitbake/bin/bitbake-layers
diff --git a/import-layers/yocto-poky/bitbake/bin/bitbake-prserv b/poky/bitbake/bin/bitbake-prserv
similarity index 100%
rename from import-layers/yocto-poky/bitbake/bin/bitbake-prserv
rename to poky/bitbake/bin/bitbake-prserv
diff --git a/import-layers/yocto-poky/bitbake/bin/bitbake-selftest b/poky/bitbake/bin/bitbake-selftest
similarity index 100%
rename from import-layers/yocto-poky/bitbake/bin/bitbake-selftest
rename to poky/bitbake/bin/bitbake-selftest
diff --git a/import-layers/yocto-poky/bitbake/bin/bitbake-worker b/poky/bitbake/bin/bitbake-worker
similarity index 100%
rename from import-layers/yocto-poky/bitbake/bin/bitbake-worker
rename to poky/bitbake/bin/bitbake-worker
diff --git a/import-layers/yocto-poky/bitbake/bin/bitdoc b/poky/bitbake/bin/bitdoc
similarity index 100%
rename from import-layers/yocto-poky/bitbake/bin/bitdoc
rename to poky/bitbake/bin/bitdoc
diff --git a/import-layers/yocto-poky/bitbake/bin/git-make-shallow b/poky/bitbake/bin/git-make-shallow
similarity index 100%
rename from import-layers/yocto-poky/bitbake/bin/git-make-shallow
rename to poky/bitbake/bin/git-make-shallow
diff --git a/import-layers/yocto-poky/bitbake/bin/toaster b/poky/bitbake/bin/toaster
similarity index 100%
rename from import-layers/yocto-poky/bitbake/bin/toaster
rename to poky/bitbake/bin/toaster
diff --git a/import-layers/yocto-poky/bitbake/bin/toaster-eventreplay b/poky/bitbake/bin/toaster-eventreplay
similarity index 100%
rename from import-layers/yocto-poky/bitbake/bin/toaster-eventreplay
rename to poky/bitbake/bin/toaster-eventreplay
diff --git a/import-layers/yocto-poky/bitbake/contrib/README b/poky/bitbake/contrib/README
similarity index 100%
rename from import-layers/yocto-poky/bitbake/contrib/README
rename to poky/bitbake/contrib/README
diff --git a/import-layers/yocto-poky/bitbake/contrib/bbdev.sh b/poky/bitbake/contrib/bbdev.sh
similarity index 100%
rename from import-layers/yocto-poky/bitbake/contrib/bbdev.sh
rename to poky/bitbake/contrib/bbdev.sh
diff --git a/import-layers/yocto-poky/bitbake/contrib/dump_cache.py b/poky/bitbake/contrib/dump_cache.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/contrib/dump_cache.py
rename to poky/bitbake/contrib/dump_cache.py
diff --git a/import-layers/yocto-poky/bitbake/contrib/vim/ftdetect/bitbake.vim b/poky/bitbake/contrib/vim/ftdetect/bitbake.vim
similarity index 100%
rename from import-layers/yocto-poky/bitbake/contrib/vim/ftdetect/bitbake.vim
rename to poky/bitbake/contrib/vim/ftdetect/bitbake.vim
diff --git a/import-layers/yocto-poky/bitbake/contrib/vim/ftplugin/bitbake.vim b/poky/bitbake/contrib/vim/ftplugin/bitbake.vim
similarity index 100%
rename from import-layers/yocto-poky/bitbake/contrib/vim/ftplugin/bitbake.vim
rename to poky/bitbake/contrib/vim/ftplugin/bitbake.vim
diff --git a/import-layers/yocto-poky/bitbake/contrib/vim/plugin/newbb.vim b/poky/bitbake/contrib/vim/plugin/newbb.vim
similarity index 100%
rename from import-layers/yocto-poky/bitbake/contrib/vim/plugin/newbb.vim
rename to poky/bitbake/contrib/vim/plugin/newbb.vim
diff --git a/import-layers/yocto-poky/bitbake/contrib/vim/syntax/bitbake.vim b/poky/bitbake/contrib/vim/syntax/bitbake.vim
similarity index 100%
rename from import-layers/yocto-poky/bitbake/contrib/vim/syntax/bitbake.vim
rename to poky/bitbake/contrib/vim/syntax/bitbake.vim
diff --git a/import-layers/yocto-poky/bitbake/doc/COPYING.GPL b/poky/bitbake/doc/COPYING.GPL
similarity index 100%
rename from import-layers/yocto-poky/bitbake/doc/COPYING.GPL
rename to poky/bitbake/doc/COPYING.GPL
diff --git a/import-layers/yocto-poky/bitbake/doc/COPYING.MIT b/poky/bitbake/doc/COPYING.MIT
similarity index 100%
rename from import-layers/yocto-poky/bitbake/doc/COPYING.MIT
rename to poky/bitbake/doc/COPYING.MIT
diff --git a/import-layers/yocto-poky/bitbake/doc/Makefile b/poky/bitbake/doc/Makefile
similarity index 100%
rename from import-layers/yocto-poky/bitbake/doc/Makefile
rename to poky/bitbake/doc/Makefile
diff --git a/import-layers/yocto-poky/bitbake/doc/README b/poky/bitbake/doc/README
similarity index 100%
rename from import-layers/yocto-poky/bitbake/doc/README
rename to poky/bitbake/doc/README
diff --git a/import-layers/yocto-poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-customization.xsl b/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-customization.xsl
similarity index 100%
rename from import-layers/yocto-poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-customization.xsl
rename to poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-customization.xsl
diff --git a/import-layers/yocto-poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.xml b/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.xml
similarity index 100%
rename from import-layers/yocto-poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.xml
rename to poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.xml
diff --git a/import-layers/yocto-poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.xml b/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.xml
similarity index 100%
rename from import-layers/yocto-poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.xml
rename to poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-fetching.xml
diff --git a/import-layers/yocto-poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-hello.xml b/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-hello.xml
similarity index 100%
rename from import-layers/yocto-poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-hello.xml
rename to poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-hello.xml
diff --git a/import-layers/yocto-poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-intro.xml b/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-intro.xml
similarity index 100%
rename from import-layers/yocto-poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-intro.xml
rename to poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-intro.xml
diff --git a/import-layers/yocto-poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml b/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml
similarity index 100%
rename from import-layers/yocto-poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml
rename to poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml
diff --git a/import-layers/yocto-poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.xml b/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.xml
similarity index 100%
rename from import-layers/yocto-poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.xml
rename to poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.xml
diff --git a/import-layers/yocto-poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-style.css b/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-style.css
similarity index 100%
rename from import-layers/yocto-poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-style.css
rename to poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual-style.css
diff --git a/import-layers/yocto-poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual.xml b/poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual.xml
similarity index 100%
rename from import-layers/yocto-poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual.xml
rename to poky/bitbake/doc/bitbake-user-manual/bitbake-user-manual.xml
diff --git a/import-layers/yocto-poky/bitbake/doc/bitbake-user-manual/figures/bitbake-title.png b/poky/bitbake/doc/bitbake-user-manual/figures/bitbake-title.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/doc/bitbake-user-manual/figures/bitbake-title.png
rename to poky/bitbake/doc/bitbake-user-manual/figures/bitbake-title.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/doc/bitbake-user-manual/html.css b/poky/bitbake/doc/bitbake-user-manual/html.css
similarity index 100%
rename from import-layers/yocto-poky/bitbake/doc/bitbake-user-manual/html.css
rename to poky/bitbake/doc/bitbake-user-manual/html.css
diff --git a/import-layers/yocto-poky/bitbake/doc/bitbake.1 b/poky/bitbake/doc/bitbake.1
similarity index 100%
rename from import-layers/yocto-poky/bitbake/doc/bitbake.1
rename to poky/bitbake/doc/bitbake.1
diff --git a/import-layers/yocto-poky/bitbake/doc/poky.ent b/poky/bitbake/doc/poky.ent
similarity index 100%
rename from import-layers/yocto-poky/bitbake/doc/poky.ent
rename to poky/bitbake/doc/poky.ent
diff --git a/import-layers/yocto-poky/bitbake/doc/template/Vera.ttf b/poky/bitbake/doc/template/Vera.ttf
similarity index 100%
rename from import-layers/yocto-poky/bitbake/doc/template/Vera.ttf
rename to poky/bitbake/doc/template/Vera.ttf
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/doc/template/Vera.xml b/poky/bitbake/doc/template/Vera.xml
similarity index 100%
rename from import-layers/yocto-poky/bitbake/doc/template/Vera.xml
rename to poky/bitbake/doc/template/Vera.xml
diff --git a/import-layers/yocto-poky/bitbake/doc/template/VeraMoBd.ttf b/poky/bitbake/doc/template/VeraMoBd.ttf
similarity index 100%
rename from import-layers/yocto-poky/bitbake/doc/template/VeraMoBd.ttf
rename to poky/bitbake/doc/template/VeraMoBd.ttf
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/doc/template/VeraMoBd.xml b/poky/bitbake/doc/template/VeraMoBd.xml
similarity index 100%
rename from import-layers/yocto-poky/bitbake/doc/template/VeraMoBd.xml
rename to poky/bitbake/doc/template/VeraMoBd.xml
diff --git a/import-layers/yocto-poky/bitbake/doc/template/VeraMono.ttf b/poky/bitbake/doc/template/VeraMono.ttf
similarity index 100%
rename from import-layers/yocto-poky/bitbake/doc/template/VeraMono.ttf
rename to poky/bitbake/doc/template/VeraMono.ttf
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/doc/template/VeraMono.xml b/poky/bitbake/doc/template/VeraMono.xml
similarity index 100%
rename from import-layers/yocto-poky/bitbake/doc/template/VeraMono.xml
rename to poky/bitbake/doc/template/VeraMono.xml
diff --git a/import-layers/yocto-poky/bitbake/doc/template/component.title.xsl b/poky/bitbake/doc/template/component.title.xsl
similarity index 100%
rename from import-layers/yocto-poky/bitbake/doc/template/component.title.xsl
rename to poky/bitbake/doc/template/component.title.xsl
diff --git a/import-layers/yocto-poky/bitbake/doc/template/db-pdf.xsl b/poky/bitbake/doc/template/db-pdf.xsl
similarity index 100%
rename from import-layers/yocto-poky/bitbake/doc/template/db-pdf.xsl
rename to poky/bitbake/doc/template/db-pdf.xsl
diff --git a/import-layers/yocto-poky/bitbake/doc/template/division.title.xsl b/poky/bitbake/doc/template/division.title.xsl
similarity index 100%
rename from import-layers/yocto-poky/bitbake/doc/template/division.title.xsl
rename to poky/bitbake/doc/template/division.title.xsl
diff --git a/import-layers/yocto-poky/bitbake/doc/template/draft.png b/poky/bitbake/doc/template/draft.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/doc/template/draft.png
rename to poky/bitbake/doc/template/draft.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/doc/template/fop-config.xml b/poky/bitbake/doc/template/fop-config.xml
similarity index 100%
rename from import-layers/yocto-poky/bitbake/doc/template/fop-config.xml
rename to poky/bitbake/doc/template/fop-config.xml
diff --git a/import-layers/yocto-poky/bitbake/doc/template/formal.object.heading.xsl b/poky/bitbake/doc/template/formal.object.heading.xsl
similarity index 100%
rename from import-layers/yocto-poky/bitbake/doc/template/formal.object.heading.xsl
rename to poky/bitbake/doc/template/formal.object.heading.xsl
diff --git a/import-layers/yocto-poky/bitbake/doc/template/gloss-permalinks.xsl b/poky/bitbake/doc/template/gloss-permalinks.xsl
similarity index 100%
rename from import-layers/yocto-poky/bitbake/doc/template/gloss-permalinks.xsl
rename to poky/bitbake/doc/template/gloss-permalinks.xsl
diff --git a/import-layers/yocto-poky/bitbake/doc/template/permalinks.xsl b/poky/bitbake/doc/template/permalinks.xsl
similarity index 100%
rename from import-layers/yocto-poky/bitbake/doc/template/permalinks.xsl
rename to poky/bitbake/doc/template/permalinks.xsl
diff --git a/import-layers/yocto-poky/bitbake/doc/template/section.title.xsl b/poky/bitbake/doc/template/section.title.xsl
similarity index 100%
rename from import-layers/yocto-poky/bitbake/doc/template/section.title.xsl
rename to poky/bitbake/doc/template/section.title.xsl
diff --git a/import-layers/yocto-poky/bitbake/doc/template/titlepage.templates.xml b/poky/bitbake/doc/template/titlepage.templates.xml
similarity index 100%
rename from import-layers/yocto-poky/bitbake/doc/template/titlepage.templates.xml
rename to poky/bitbake/doc/template/titlepage.templates.xml
diff --git a/import-layers/yocto-poky/bitbake/doc/tools/docbook-to-pdf b/poky/bitbake/doc/tools/docbook-to-pdf
similarity index 100%
rename from import-layers/yocto-poky/bitbake/doc/tools/docbook-to-pdf
rename to poky/bitbake/doc/tools/docbook-to-pdf
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/COW.py b/poky/bitbake/lib/bb/COW.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/COW.py
rename to poky/bitbake/lib/bb/COW.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/__init__.py b/poky/bitbake/lib/bb/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/__init__.py
rename to poky/bitbake/lib/bb/__init__.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/build.py b/poky/bitbake/lib/bb/build.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/build.py
rename to poky/bitbake/lib/bb/build.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/cache.py b/poky/bitbake/lib/bb/cache.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/cache.py
rename to poky/bitbake/lib/bb/cache.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/cache_extra.py b/poky/bitbake/lib/bb/cache_extra.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/cache_extra.py
rename to poky/bitbake/lib/bb/cache_extra.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/checksum.py b/poky/bitbake/lib/bb/checksum.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/checksum.py
rename to poky/bitbake/lib/bb/checksum.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/codeparser.py b/poky/bitbake/lib/bb/codeparser.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/codeparser.py
rename to poky/bitbake/lib/bb/codeparser.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/command.py b/poky/bitbake/lib/bb/command.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/command.py
rename to poky/bitbake/lib/bb/command.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/compat.py b/poky/bitbake/lib/bb/compat.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/compat.py
rename to poky/bitbake/lib/bb/compat.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/cooker.py b/poky/bitbake/lib/bb/cooker.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/cooker.py
rename to poky/bitbake/lib/bb/cooker.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/cookerdata.py b/poky/bitbake/lib/bb/cookerdata.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/cookerdata.py
rename to poky/bitbake/lib/bb/cookerdata.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/daemonize.py b/poky/bitbake/lib/bb/daemonize.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/daemonize.py
rename to poky/bitbake/lib/bb/daemonize.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/data.py b/poky/bitbake/lib/bb/data.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/data.py
rename to poky/bitbake/lib/bb/data.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/data_smart.py b/poky/bitbake/lib/bb/data_smart.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/data_smart.py
rename to poky/bitbake/lib/bb/data_smart.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/event.py b/poky/bitbake/lib/bb/event.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/event.py
rename to poky/bitbake/lib/bb/event.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/exceptions.py b/poky/bitbake/lib/bb/exceptions.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/exceptions.py
rename to poky/bitbake/lib/bb/exceptions.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/fetch2/__init__.py b/poky/bitbake/lib/bb/fetch2/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/fetch2/__init__.py
rename to poky/bitbake/lib/bb/fetch2/__init__.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/fetch2/bzr.py b/poky/bitbake/lib/bb/fetch2/bzr.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/fetch2/bzr.py
rename to poky/bitbake/lib/bb/fetch2/bzr.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/fetch2/clearcase.py b/poky/bitbake/lib/bb/fetch2/clearcase.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/fetch2/clearcase.py
rename to poky/bitbake/lib/bb/fetch2/clearcase.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/fetch2/cvs.py b/poky/bitbake/lib/bb/fetch2/cvs.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/fetch2/cvs.py
rename to poky/bitbake/lib/bb/fetch2/cvs.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/fetch2/git.py b/poky/bitbake/lib/bb/fetch2/git.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/fetch2/git.py
rename to poky/bitbake/lib/bb/fetch2/git.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/fetch2/gitannex.py b/poky/bitbake/lib/bb/fetch2/gitannex.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/fetch2/gitannex.py
rename to poky/bitbake/lib/bb/fetch2/gitannex.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/fetch2/gitsm.py b/poky/bitbake/lib/bb/fetch2/gitsm.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/fetch2/gitsm.py
rename to poky/bitbake/lib/bb/fetch2/gitsm.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/fetch2/hg.py b/poky/bitbake/lib/bb/fetch2/hg.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/fetch2/hg.py
rename to poky/bitbake/lib/bb/fetch2/hg.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/fetch2/local.py b/poky/bitbake/lib/bb/fetch2/local.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/fetch2/local.py
rename to poky/bitbake/lib/bb/fetch2/local.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/fetch2/npm.py b/poky/bitbake/lib/bb/fetch2/npm.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/fetch2/npm.py
rename to poky/bitbake/lib/bb/fetch2/npm.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/fetch2/osc.py b/poky/bitbake/lib/bb/fetch2/osc.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/fetch2/osc.py
rename to poky/bitbake/lib/bb/fetch2/osc.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/fetch2/perforce.py b/poky/bitbake/lib/bb/fetch2/perforce.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/fetch2/perforce.py
rename to poky/bitbake/lib/bb/fetch2/perforce.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/fetch2/repo.py b/poky/bitbake/lib/bb/fetch2/repo.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/fetch2/repo.py
rename to poky/bitbake/lib/bb/fetch2/repo.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/fetch2/s3.py b/poky/bitbake/lib/bb/fetch2/s3.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/fetch2/s3.py
rename to poky/bitbake/lib/bb/fetch2/s3.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/fetch2/sftp.py b/poky/bitbake/lib/bb/fetch2/sftp.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/fetch2/sftp.py
rename to poky/bitbake/lib/bb/fetch2/sftp.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/fetch2/ssh.py b/poky/bitbake/lib/bb/fetch2/ssh.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/fetch2/ssh.py
rename to poky/bitbake/lib/bb/fetch2/ssh.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/fetch2/svn.py b/poky/bitbake/lib/bb/fetch2/svn.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/fetch2/svn.py
rename to poky/bitbake/lib/bb/fetch2/svn.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/fetch2/wget.py b/poky/bitbake/lib/bb/fetch2/wget.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/fetch2/wget.py
rename to poky/bitbake/lib/bb/fetch2/wget.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/main.py b/poky/bitbake/lib/bb/main.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/main.py
rename to poky/bitbake/lib/bb/main.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/methodpool.py b/poky/bitbake/lib/bb/methodpool.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/methodpool.py
rename to poky/bitbake/lib/bb/methodpool.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/monitordisk.py b/poky/bitbake/lib/bb/monitordisk.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/monitordisk.py
rename to poky/bitbake/lib/bb/monitordisk.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/msg.py b/poky/bitbake/lib/bb/msg.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/msg.py
rename to poky/bitbake/lib/bb/msg.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/namedtuple_with_abc.py b/poky/bitbake/lib/bb/namedtuple_with_abc.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/namedtuple_with_abc.py
rename to poky/bitbake/lib/bb/namedtuple_with_abc.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/parse/__init__.py b/poky/bitbake/lib/bb/parse/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/parse/__init__.py
rename to poky/bitbake/lib/bb/parse/__init__.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/parse/ast.py b/poky/bitbake/lib/bb/parse/ast.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/parse/ast.py
rename to poky/bitbake/lib/bb/parse/ast.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/parse/parse_py/BBHandler.py b/poky/bitbake/lib/bb/parse/parse_py/BBHandler.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/parse/parse_py/BBHandler.py
rename to poky/bitbake/lib/bb/parse/parse_py/BBHandler.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/poky/bitbake/lib/bb/parse/parse_py/ConfHandler.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/parse/parse_py/ConfHandler.py
rename to poky/bitbake/lib/bb/parse/parse_py/ConfHandler.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/parse/parse_py/__init__.py b/poky/bitbake/lib/bb/parse/parse_py/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/parse/parse_py/__init__.py
rename to poky/bitbake/lib/bb/parse/parse_py/__init__.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/persist_data.py b/poky/bitbake/lib/bb/persist_data.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/persist_data.py
rename to poky/bitbake/lib/bb/persist_data.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/process.py b/poky/bitbake/lib/bb/process.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/process.py
rename to poky/bitbake/lib/bb/process.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/progress.py b/poky/bitbake/lib/bb/progress.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/progress.py
rename to poky/bitbake/lib/bb/progress.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/providers.py b/poky/bitbake/lib/bb/providers.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/providers.py
rename to poky/bitbake/lib/bb/providers.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/pysh/__init__.py b/poky/bitbake/lib/bb/pysh/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/pysh/__init__.py
rename to poky/bitbake/lib/bb/pysh/__init__.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/pysh/builtin.py b/poky/bitbake/lib/bb/pysh/builtin.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/pysh/builtin.py
rename to poky/bitbake/lib/bb/pysh/builtin.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/pysh/interp.py b/poky/bitbake/lib/bb/pysh/interp.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/pysh/interp.py
rename to poky/bitbake/lib/bb/pysh/interp.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/pysh/lsprof.py b/poky/bitbake/lib/bb/pysh/lsprof.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/pysh/lsprof.py
rename to poky/bitbake/lib/bb/pysh/lsprof.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/pysh/pysh.py b/poky/bitbake/lib/bb/pysh/pysh.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/pysh/pysh.py
rename to poky/bitbake/lib/bb/pysh/pysh.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/pysh/pyshlex.py b/poky/bitbake/lib/bb/pysh/pyshlex.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/pysh/pyshlex.py
rename to poky/bitbake/lib/bb/pysh/pyshlex.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/pysh/pyshyacc.py b/poky/bitbake/lib/bb/pysh/pyshyacc.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/pysh/pyshyacc.py
rename to poky/bitbake/lib/bb/pysh/pyshyacc.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/pysh/sherrors.py b/poky/bitbake/lib/bb/pysh/sherrors.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/pysh/sherrors.py
rename to poky/bitbake/lib/bb/pysh/sherrors.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/pysh/subprocess_fix.py b/poky/bitbake/lib/bb/pysh/subprocess_fix.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/pysh/subprocess_fix.py
rename to poky/bitbake/lib/bb/pysh/subprocess_fix.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/remotedata.py b/poky/bitbake/lib/bb/remotedata.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/remotedata.py
rename to poky/bitbake/lib/bb/remotedata.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/runqueue.py b/poky/bitbake/lib/bb/runqueue.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/runqueue.py
rename to poky/bitbake/lib/bb/runqueue.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/server/__init__.py b/poky/bitbake/lib/bb/server/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/server/__init__.py
rename to poky/bitbake/lib/bb/server/__init__.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/server/process.py b/poky/bitbake/lib/bb/server/process.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/server/process.py
rename to poky/bitbake/lib/bb/server/process.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/server/xmlrpcclient.py b/poky/bitbake/lib/bb/server/xmlrpcclient.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/server/xmlrpcclient.py
rename to poky/bitbake/lib/bb/server/xmlrpcclient.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/server/xmlrpcserver.py b/poky/bitbake/lib/bb/server/xmlrpcserver.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/server/xmlrpcserver.py
rename to poky/bitbake/lib/bb/server/xmlrpcserver.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/siggen.py b/poky/bitbake/lib/bb/siggen.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/siggen.py
rename to poky/bitbake/lib/bb/siggen.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/taskdata.py b/poky/bitbake/lib/bb/taskdata.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/taskdata.py
rename to poky/bitbake/lib/bb/taskdata.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/tests/__init__.py b/poky/bitbake/lib/bb/tests/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/tests/__init__.py
rename to poky/bitbake/lib/bb/tests/__init__.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/tests/codeparser.py b/poky/bitbake/lib/bb/tests/codeparser.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/tests/codeparser.py
rename to poky/bitbake/lib/bb/tests/codeparser.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/tests/cow.py b/poky/bitbake/lib/bb/tests/cow.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/tests/cow.py
rename to poky/bitbake/lib/bb/tests/cow.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/tests/data.py b/poky/bitbake/lib/bb/tests/data.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/tests/data.py
rename to poky/bitbake/lib/bb/tests/data.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/tests/event.py b/poky/bitbake/lib/bb/tests/event.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/tests/event.py
rename to poky/bitbake/lib/bb/tests/event.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/tests/fetch.py b/poky/bitbake/lib/bb/tests/fetch.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/tests/fetch.py
rename to poky/bitbake/lib/bb/tests/fetch.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/tests/parse.py b/poky/bitbake/lib/bb/tests/parse.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/tests/parse.py
rename to poky/bitbake/lib/bb/tests/parse.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/tests/utils.py b/poky/bitbake/lib/bb/tests/utils.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/tests/utils.py
rename to poky/bitbake/lib/bb/tests/utils.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/tinfoil.py b/poky/bitbake/lib/bb/tinfoil.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/tinfoil.py
rename to poky/bitbake/lib/bb/tinfoil.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/ui/__init__.py b/poky/bitbake/lib/bb/ui/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/ui/__init__.py
rename to poky/bitbake/lib/bb/ui/__init__.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/ui/buildinfohelper.py b/poky/bitbake/lib/bb/ui/buildinfohelper.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/ui/buildinfohelper.py
rename to poky/bitbake/lib/bb/ui/buildinfohelper.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/ui/icons/images/images_display.png b/poky/bitbake/lib/bb/ui/icons/images/images_display.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/ui/icons/images/images_display.png
rename to poky/bitbake/lib/bb/ui/icons/images/images_display.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/ui/icons/images/images_hover.png b/poky/bitbake/lib/bb/ui/icons/images/images_hover.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/ui/icons/images/images_hover.png
rename to poky/bitbake/lib/bb/ui/icons/images/images_hover.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/ui/icons/indicators/add-hover.png b/poky/bitbake/lib/bb/ui/icons/indicators/add-hover.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/ui/icons/indicators/add-hover.png
rename to poky/bitbake/lib/bb/ui/icons/indicators/add-hover.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/ui/icons/indicators/add.png b/poky/bitbake/lib/bb/ui/icons/indicators/add.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/ui/icons/indicators/add.png
rename to poky/bitbake/lib/bb/ui/icons/indicators/add.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/ui/icons/indicators/alert.png b/poky/bitbake/lib/bb/ui/icons/indicators/alert.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/ui/icons/indicators/alert.png
rename to poky/bitbake/lib/bb/ui/icons/indicators/alert.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/ui/icons/indicators/confirmation.png b/poky/bitbake/lib/bb/ui/icons/indicators/confirmation.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/ui/icons/indicators/confirmation.png
rename to poky/bitbake/lib/bb/ui/icons/indicators/confirmation.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/ui/icons/indicators/denied.png b/poky/bitbake/lib/bb/ui/icons/indicators/denied.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/ui/icons/indicators/denied.png
rename to poky/bitbake/lib/bb/ui/icons/indicators/denied.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/ui/icons/indicators/error.png b/poky/bitbake/lib/bb/ui/icons/indicators/error.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/ui/icons/indicators/error.png
rename to poky/bitbake/lib/bb/ui/icons/indicators/error.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/ui/icons/indicators/info.png b/poky/bitbake/lib/bb/ui/icons/indicators/info.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/ui/icons/indicators/info.png
rename to poky/bitbake/lib/bb/ui/icons/indicators/info.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/ui/icons/indicators/issues.png b/poky/bitbake/lib/bb/ui/icons/indicators/issues.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/ui/icons/indicators/issues.png
rename to poky/bitbake/lib/bb/ui/icons/indicators/issues.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/ui/icons/indicators/refresh.png b/poky/bitbake/lib/bb/ui/icons/indicators/refresh.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/ui/icons/indicators/refresh.png
rename to poky/bitbake/lib/bb/ui/icons/indicators/refresh.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/ui/icons/indicators/remove-hover.png b/poky/bitbake/lib/bb/ui/icons/indicators/remove-hover.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/ui/icons/indicators/remove-hover.png
rename to poky/bitbake/lib/bb/ui/icons/indicators/remove-hover.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/ui/icons/indicators/remove.png b/poky/bitbake/lib/bb/ui/icons/indicators/remove.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/ui/icons/indicators/remove.png
rename to poky/bitbake/lib/bb/ui/icons/indicators/remove.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/ui/icons/indicators/tick.png b/poky/bitbake/lib/bb/ui/icons/indicators/tick.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/ui/icons/indicators/tick.png
rename to poky/bitbake/lib/bb/ui/icons/indicators/tick.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/ui/icons/info/info_display.png b/poky/bitbake/lib/bb/ui/icons/info/info_display.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/ui/icons/info/info_display.png
rename to poky/bitbake/lib/bb/ui/icons/info/info_display.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/ui/icons/info/info_hover.png b/poky/bitbake/lib/bb/ui/icons/info/info_hover.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/ui/icons/info/info_hover.png
rename to poky/bitbake/lib/bb/ui/icons/info/info_hover.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/ui/icons/layers/layers_display.png b/poky/bitbake/lib/bb/ui/icons/layers/layers_display.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/ui/icons/layers/layers_display.png
rename to poky/bitbake/lib/bb/ui/icons/layers/layers_display.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/ui/icons/layers/layers_hover.png b/poky/bitbake/lib/bb/ui/icons/layers/layers_hover.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/ui/icons/layers/layers_hover.png
rename to poky/bitbake/lib/bb/ui/icons/layers/layers_hover.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/ui/icons/packages/packages_display.png b/poky/bitbake/lib/bb/ui/icons/packages/packages_display.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/ui/icons/packages/packages_display.png
rename to poky/bitbake/lib/bb/ui/icons/packages/packages_display.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/ui/icons/packages/packages_hover.png b/poky/bitbake/lib/bb/ui/icons/packages/packages_hover.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/ui/icons/packages/packages_hover.png
rename to poky/bitbake/lib/bb/ui/icons/packages/packages_hover.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/ui/icons/recipe/recipe_display.png b/poky/bitbake/lib/bb/ui/icons/recipe/recipe_display.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/ui/icons/recipe/recipe_display.png
rename to poky/bitbake/lib/bb/ui/icons/recipe/recipe_display.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/ui/icons/recipe/recipe_hover.png b/poky/bitbake/lib/bb/ui/icons/recipe/recipe_hover.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/ui/icons/recipe/recipe_hover.png
rename to poky/bitbake/lib/bb/ui/icons/recipe/recipe_hover.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/ui/icons/settings/settings_display.png b/poky/bitbake/lib/bb/ui/icons/settings/settings_display.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/ui/icons/settings/settings_display.png
rename to poky/bitbake/lib/bb/ui/icons/settings/settings_display.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/ui/icons/settings/settings_hover.png b/poky/bitbake/lib/bb/ui/icons/settings/settings_hover.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/ui/icons/settings/settings_hover.png
rename to poky/bitbake/lib/bb/ui/icons/settings/settings_hover.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/ui/icons/templates/templates_display.png b/poky/bitbake/lib/bb/ui/icons/templates/templates_display.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/ui/icons/templates/templates_display.png
rename to poky/bitbake/lib/bb/ui/icons/templates/templates_display.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/ui/icons/templates/templates_hover.png b/poky/bitbake/lib/bb/ui/icons/templates/templates_hover.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/ui/icons/templates/templates_hover.png
rename to poky/bitbake/lib/bb/ui/icons/templates/templates_hover.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/ui/knotty.py b/poky/bitbake/lib/bb/ui/knotty.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/ui/knotty.py
rename to poky/bitbake/lib/bb/ui/knotty.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/ui/ncurses.py b/poky/bitbake/lib/bb/ui/ncurses.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/ui/ncurses.py
rename to poky/bitbake/lib/bb/ui/ncurses.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/ui/taskexp.py b/poky/bitbake/lib/bb/ui/taskexp.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/ui/taskexp.py
rename to poky/bitbake/lib/bb/ui/taskexp.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/ui/toasterui.py b/poky/bitbake/lib/bb/ui/toasterui.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/ui/toasterui.py
rename to poky/bitbake/lib/bb/ui/toasterui.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/ui/uievent.py b/poky/bitbake/lib/bb/ui/uievent.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/ui/uievent.py
rename to poky/bitbake/lib/bb/ui/uievent.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/ui/uihelper.py b/poky/bitbake/lib/bb/ui/uihelper.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/ui/uihelper.py
rename to poky/bitbake/lib/bb/ui/uihelper.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/utils.py b/poky/bitbake/lib/bb/utils.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bb/utils.py
rename to poky/bitbake/lib/bb/utils.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bblayers/__init__.py b/poky/bitbake/lib/bblayers/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bblayers/__init__.py
rename to poky/bitbake/lib/bblayers/__init__.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bblayers/action.py b/poky/bitbake/lib/bblayers/action.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bblayers/action.py
rename to poky/bitbake/lib/bblayers/action.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bblayers/common.py b/poky/bitbake/lib/bblayers/common.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bblayers/common.py
rename to poky/bitbake/lib/bblayers/common.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bblayers/layerindex.py b/poky/bitbake/lib/bblayers/layerindex.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bblayers/layerindex.py
rename to poky/bitbake/lib/bblayers/layerindex.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bblayers/query.py b/poky/bitbake/lib/bblayers/query.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bblayers/query.py
rename to poky/bitbake/lib/bblayers/query.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bs4/AUTHORS.txt b/poky/bitbake/lib/bs4/AUTHORS.txt
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bs4/AUTHORS.txt
rename to poky/bitbake/lib/bs4/AUTHORS.txt
diff --git a/import-layers/yocto-poky/bitbake/lib/bs4/COPYING.txt b/poky/bitbake/lib/bs4/COPYING.txt
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bs4/COPYING.txt
rename to poky/bitbake/lib/bs4/COPYING.txt
diff --git a/import-layers/yocto-poky/bitbake/lib/bs4/NEWS.txt b/poky/bitbake/lib/bs4/NEWS.txt
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bs4/NEWS.txt
rename to poky/bitbake/lib/bs4/NEWS.txt
diff --git a/import-layers/yocto-poky/bitbake/lib/bs4/__init__.py b/poky/bitbake/lib/bs4/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bs4/__init__.py
rename to poky/bitbake/lib/bs4/__init__.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bs4/builder/__init__.py b/poky/bitbake/lib/bs4/builder/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bs4/builder/__init__.py
rename to poky/bitbake/lib/bs4/builder/__init__.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bs4/builder/_html5lib.py b/poky/bitbake/lib/bs4/builder/_html5lib.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bs4/builder/_html5lib.py
rename to poky/bitbake/lib/bs4/builder/_html5lib.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bs4/builder/_htmlparser.py b/poky/bitbake/lib/bs4/builder/_htmlparser.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bs4/builder/_htmlparser.py
rename to poky/bitbake/lib/bs4/builder/_htmlparser.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bs4/builder/_lxml.py b/poky/bitbake/lib/bs4/builder/_lxml.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bs4/builder/_lxml.py
rename to poky/bitbake/lib/bs4/builder/_lxml.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bs4/dammit.py b/poky/bitbake/lib/bs4/dammit.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bs4/dammit.py
rename to poky/bitbake/lib/bs4/dammit.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bs4/diagnose.py b/poky/bitbake/lib/bs4/diagnose.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bs4/diagnose.py
rename to poky/bitbake/lib/bs4/diagnose.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bs4/element.py b/poky/bitbake/lib/bs4/element.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bs4/element.py
rename to poky/bitbake/lib/bs4/element.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bs4/testing.py b/poky/bitbake/lib/bs4/testing.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bs4/testing.py
rename to poky/bitbake/lib/bs4/testing.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bs4/tests/__init__.py b/poky/bitbake/lib/bs4/tests/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bs4/tests/__init__.py
rename to poky/bitbake/lib/bs4/tests/__init__.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bs4/tests/test_builder_registry.py b/poky/bitbake/lib/bs4/tests/test_builder_registry.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bs4/tests/test_builder_registry.py
rename to poky/bitbake/lib/bs4/tests/test_builder_registry.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bs4/tests/test_docs.py b/poky/bitbake/lib/bs4/tests/test_docs.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bs4/tests/test_docs.py
rename to poky/bitbake/lib/bs4/tests/test_docs.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bs4/tests/test_html5lib.py b/poky/bitbake/lib/bs4/tests/test_html5lib.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bs4/tests/test_html5lib.py
rename to poky/bitbake/lib/bs4/tests/test_html5lib.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bs4/tests/test_htmlparser.py b/poky/bitbake/lib/bs4/tests/test_htmlparser.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bs4/tests/test_htmlparser.py
rename to poky/bitbake/lib/bs4/tests/test_htmlparser.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bs4/tests/test_lxml.py b/poky/bitbake/lib/bs4/tests/test_lxml.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bs4/tests/test_lxml.py
rename to poky/bitbake/lib/bs4/tests/test_lxml.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bs4/tests/test_soup.py b/poky/bitbake/lib/bs4/tests/test_soup.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bs4/tests/test_soup.py
rename to poky/bitbake/lib/bs4/tests/test_soup.py
diff --git a/import-layers/yocto-poky/bitbake/lib/bs4/tests/test_tree.py b/poky/bitbake/lib/bs4/tests/test_tree.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/bs4/tests/test_tree.py
rename to poky/bitbake/lib/bs4/tests/test_tree.py
diff --git a/import-layers/yocto-poky/bitbake/lib/codegen.py b/poky/bitbake/lib/codegen.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/codegen.py
rename to poky/bitbake/lib/codegen.py
diff --git a/import-layers/yocto-poky/bitbake/lib/ply/__init__.py b/poky/bitbake/lib/ply/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/ply/__init__.py
rename to poky/bitbake/lib/ply/__init__.py
diff --git a/import-layers/yocto-poky/bitbake/lib/ply/lex.py b/poky/bitbake/lib/ply/lex.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/ply/lex.py
rename to poky/bitbake/lib/ply/lex.py
diff --git a/import-layers/yocto-poky/bitbake/lib/ply/yacc.py b/poky/bitbake/lib/ply/yacc.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/ply/yacc.py
rename to poky/bitbake/lib/ply/yacc.py
diff --git a/import-layers/yocto-poky/bitbake/lib/progressbar/LICENSE.txt b/poky/bitbake/lib/progressbar/LICENSE.txt
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/progressbar/LICENSE.txt
rename to poky/bitbake/lib/progressbar/LICENSE.txt
diff --git a/import-layers/yocto-poky/bitbake/lib/progressbar/__init__.py b/poky/bitbake/lib/progressbar/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/progressbar/__init__.py
rename to poky/bitbake/lib/progressbar/__init__.py
diff --git a/import-layers/yocto-poky/bitbake/lib/progressbar/compat.py b/poky/bitbake/lib/progressbar/compat.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/progressbar/compat.py
rename to poky/bitbake/lib/progressbar/compat.py
diff --git a/import-layers/yocto-poky/bitbake/lib/progressbar/progressbar.py b/poky/bitbake/lib/progressbar/progressbar.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/progressbar/progressbar.py
rename to poky/bitbake/lib/progressbar/progressbar.py
diff --git a/import-layers/yocto-poky/bitbake/lib/progressbar/widgets.py b/poky/bitbake/lib/progressbar/widgets.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/progressbar/widgets.py
rename to poky/bitbake/lib/progressbar/widgets.py
diff --git a/import-layers/yocto-poky/bitbake/lib/prserv/__init__.py b/poky/bitbake/lib/prserv/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/prserv/__init__.py
rename to poky/bitbake/lib/prserv/__init__.py
diff --git a/import-layers/yocto-poky/bitbake/lib/prserv/db.py b/poky/bitbake/lib/prserv/db.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/prserv/db.py
rename to poky/bitbake/lib/prserv/db.py
diff --git a/import-layers/yocto-poky/bitbake/lib/prserv/serv.py b/poky/bitbake/lib/prserv/serv.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/prserv/serv.py
rename to poky/bitbake/lib/prserv/serv.py
diff --git a/import-layers/yocto-poky/bitbake/lib/pyinotify.py b/poky/bitbake/lib/pyinotify.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/pyinotify.py
rename to poky/bitbake/lib/pyinotify.py
diff --git a/import-layers/yocto-poky/bitbake/lib/simplediff/LICENSE b/poky/bitbake/lib/simplediff/LICENSE
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/simplediff/LICENSE
rename to poky/bitbake/lib/simplediff/LICENSE
diff --git a/import-layers/yocto-poky/bitbake/lib/simplediff/__init__.py b/poky/bitbake/lib/simplediff/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/simplediff/__init__.py
rename to poky/bitbake/lib/simplediff/__init__.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/__init__.py b/poky/bitbake/lib/toaster/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/__init__.py
rename to poky/bitbake/lib/toaster/__init__.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/bldcollector/__init__.py b/poky/bitbake/lib/toaster/bldcollector/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/bldcollector/__init__.py
rename to poky/bitbake/lib/toaster/bldcollector/__init__.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/bldcollector/admin.py b/poky/bitbake/lib/toaster/bldcollector/admin.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/bldcollector/admin.py
rename to poky/bitbake/lib/toaster/bldcollector/admin.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/bldcollector/urls.py b/poky/bitbake/lib/toaster/bldcollector/urls.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/bldcollector/urls.py
rename to poky/bitbake/lib/toaster/bldcollector/urls.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/bldcollector/views.py b/poky/bitbake/lib/toaster/bldcollector/views.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/bldcollector/views.py
rename to poky/bitbake/lib/toaster/bldcollector/views.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/bldcontrol/__init__.py b/poky/bitbake/lib/toaster/bldcontrol/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/bldcontrol/__init__.py
rename to poky/bitbake/lib/toaster/bldcontrol/__init__.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/bldcontrol/admin.py b/poky/bitbake/lib/toaster/bldcontrol/admin.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/bldcontrol/admin.py
rename to poky/bitbake/lib/toaster/bldcontrol/admin.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/bldcontrol/bbcontroller.py b/poky/bitbake/lib/toaster/bldcontrol/bbcontroller.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/bldcontrol/bbcontroller.py
rename to poky/bitbake/lib/toaster/bldcontrol/bbcontroller.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/poky/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
rename to poky/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/bldcontrol/management/__init__.py b/poky/bitbake/lib/toaster/bldcontrol/management/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/bldcontrol/management/__init__.py
rename to poky/bitbake/lib/toaster/bldcontrol/management/__init__.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/bldcontrol/management/commands/__init__.py b/poky/bitbake/lib/toaster/bldcontrol/management/commands/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/bldcontrol/management/commands/__init__.py
rename to poky/bitbake/lib/toaster/bldcontrol/management/commands/__init__.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py b/poky/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py
rename to poky/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py b/poky/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py
rename to poky/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/bldcontrol/migrations/0001_initial.py b/poky/bitbake/lib/toaster/bldcontrol/migrations/0001_initial.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/bldcontrol/migrations/0001_initial.py
rename to poky/bitbake/lib/toaster/bldcontrol/migrations/0001_initial.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/bldcontrol/migrations/0002_auto_20160120_1250.py b/poky/bitbake/lib/toaster/bldcontrol/migrations/0002_auto_20160120_1250.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/bldcontrol/migrations/0002_auto_20160120_1250.py
rename to poky/bitbake/lib/toaster/bldcontrol/migrations/0002_auto_20160120_1250.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/bldcontrol/migrations/0003_add_cancelling_state.py b/poky/bitbake/lib/toaster/bldcontrol/migrations/0003_add_cancelling_state.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/bldcontrol/migrations/0003_add_cancelling_state.py
rename to poky/bitbake/lib/toaster/bldcontrol/migrations/0003_add_cancelling_state.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/bldcontrol/migrations/0004_auto_20160523_1446.py b/poky/bitbake/lib/toaster/bldcontrol/migrations/0004_auto_20160523_1446.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/bldcontrol/migrations/0004_auto_20160523_1446.py
rename to poky/bitbake/lib/toaster/bldcontrol/migrations/0004_auto_20160523_1446.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/bldcontrol/migrations/0005_reorder_buildrequest_states.py b/poky/bitbake/lib/toaster/bldcontrol/migrations/0005_reorder_buildrequest_states.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/bldcontrol/migrations/0005_reorder_buildrequest_states.py
rename to poky/bitbake/lib/toaster/bldcontrol/migrations/0005_reorder_buildrequest_states.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/bldcontrol/migrations/0006_brlayer_local_source_dir.py b/poky/bitbake/lib/toaster/bldcontrol/migrations/0006_brlayer_local_source_dir.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/bldcontrol/migrations/0006_brlayer_local_source_dir.py
rename to poky/bitbake/lib/toaster/bldcontrol/migrations/0006_brlayer_local_source_dir.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/bldcontrol/migrations/0007_brlayers_optional_gitinfo.py b/poky/bitbake/lib/toaster/bldcontrol/migrations/0007_brlayers_optional_gitinfo.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/bldcontrol/migrations/0007_brlayers_optional_gitinfo.py
rename to poky/bitbake/lib/toaster/bldcontrol/migrations/0007_brlayers_optional_gitinfo.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/bldcontrol/migrations/__init__.py b/poky/bitbake/lib/toaster/bldcontrol/migrations/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/bldcontrol/migrations/__init__.py
rename to poky/bitbake/lib/toaster/bldcontrol/migrations/__init__.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/bldcontrol/models.py b/poky/bitbake/lib/toaster/bldcontrol/models.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/bldcontrol/models.py
rename to poky/bitbake/lib/toaster/bldcontrol/models.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/bldcontrol/views.py b/poky/bitbake/lib/toaster/bldcontrol/views.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/bldcontrol/views.py
rename to poky/bitbake/lib/toaster/bldcontrol/views.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/manage.py b/poky/bitbake/lib/toaster/manage.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/manage.py
rename to poky/bitbake/lib/toaster/manage.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/orm/__init__.py b/poky/bitbake/lib/toaster/orm/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/orm/__init__.py
rename to poky/bitbake/lib/toaster/orm/__init__.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/orm/fixtures/README b/poky/bitbake/lib/toaster/orm/fixtures/README
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/orm/fixtures/README
rename to poky/bitbake/lib/toaster/orm/fixtures/README
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/orm/fixtures/custom_toaster_append.sh_sample b/poky/bitbake/lib/toaster/orm/fixtures/custom_toaster_append.sh_sample
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/orm/fixtures/custom_toaster_append.sh_sample
rename to poky/bitbake/lib/toaster/orm/fixtures/custom_toaster_append.sh_sample
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/orm/fixtures/oe-core.xml b/poky/bitbake/lib/toaster/orm/fixtures/oe-core.xml
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/orm/fixtures/oe-core.xml
rename to poky/bitbake/lib/toaster/orm/fixtures/oe-core.xml
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/orm/fixtures/poky.xml b/poky/bitbake/lib/toaster/orm/fixtures/poky.xml
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/orm/fixtures/poky.xml
rename to poky/bitbake/lib/toaster/orm/fixtures/poky.xml
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/orm/fixtures/settings.xml b/poky/bitbake/lib/toaster/orm/fixtures/settings.xml
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/orm/fixtures/settings.xml
rename to poky/bitbake/lib/toaster/orm/fixtures/settings.xml
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/orm/management/__init__.py b/poky/bitbake/lib/toaster/orm/management/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/orm/management/__init__.py
rename to poky/bitbake/lib/toaster/orm/management/__init__.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/orm/management/commands/__init__.py b/poky/bitbake/lib/toaster/orm/management/commands/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/orm/management/commands/__init__.py
rename to poky/bitbake/lib/toaster/orm/management/commands/__init__.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/orm/management/commands/lsupdates.py b/poky/bitbake/lib/toaster/orm/management/commands/lsupdates.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/orm/management/commands/lsupdates.py
rename to poky/bitbake/lib/toaster/orm/management/commands/lsupdates.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/orm/migrations/0001_initial.py b/poky/bitbake/lib/toaster/orm/migrations/0001_initial.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/orm/migrations/0001_initial.py
rename to poky/bitbake/lib/toaster/orm/migrations/0001_initial.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/orm/migrations/0002_customimagerecipe.py b/poky/bitbake/lib/toaster/orm/migrations/0002_customimagerecipe.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/orm/migrations/0002_customimagerecipe.py
rename to poky/bitbake/lib/toaster/orm/migrations/0002_customimagerecipe.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/orm/migrations/0003_customimagepackage.py b/poky/bitbake/lib/toaster/orm/migrations/0003_customimagepackage.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/orm/migrations/0003_customimagepackage.py
rename to poky/bitbake/lib/toaster/orm/migrations/0003_customimagepackage.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/orm/migrations/0004_provides.py b/poky/bitbake/lib/toaster/orm/migrations/0004_provides.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/orm/migrations/0004_provides.py
rename to poky/bitbake/lib/toaster/orm/migrations/0004_provides.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/orm/migrations/0005_task_field_separation.py b/poky/bitbake/lib/toaster/orm/migrations/0005_task_field_separation.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/orm/migrations/0005_task_field_separation.py
rename to poky/bitbake/lib/toaster/orm/migrations/0005_task_field_separation.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/orm/migrations/0006_add_cancelled_state.py b/poky/bitbake/lib/toaster/orm/migrations/0006_add_cancelled_state.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/orm/migrations/0006_add_cancelled_state.py
rename to poky/bitbake/lib/toaster/orm/migrations/0006_add_cancelled_state.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/orm/migrations/0007_auto_20160523_1446.py b/poky/bitbake/lib/toaster/orm/migrations/0007_auto_20160523_1446.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/orm/migrations/0007_auto_20160523_1446.py
rename to poky/bitbake/lib/toaster/orm/migrations/0007_auto_20160523_1446.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/orm/migrations/0008_refactor_artifact_models.py b/poky/bitbake/lib/toaster/orm/migrations/0008_refactor_artifact_models.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/orm/migrations/0008_refactor_artifact_models.py
rename to poky/bitbake/lib/toaster/orm/migrations/0008_refactor_artifact_models.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/orm/migrations/0009_target_package_manifest_path.py b/poky/bitbake/lib/toaster/orm/migrations/0009_target_package_manifest_path.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/orm/migrations/0009_target_package_manifest_path.py
rename to poky/bitbake/lib/toaster/orm/migrations/0009_target_package_manifest_path.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/orm/migrations/0010_delete_layer_source_references.py b/poky/bitbake/lib/toaster/orm/migrations/0010_delete_layer_source_references.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/orm/migrations/0010_delete_layer_source_references.py
rename to poky/bitbake/lib/toaster/orm/migrations/0010_delete_layer_source_references.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/orm/migrations/0011_delete_layersource.py b/poky/bitbake/lib/toaster/orm/migrations/0011_delete_layersource.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/orm/migrations/0011_delete_layersource.py
rename to poky/bitbake/lib/toaster/orm/migrations/0011_delete_layersource.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/orm/migrations/0012_use_release_instead_of_up_branch.py b/poky/bitbake/lib/toaster/orm/migrations/0012_use_release_instead_of_up_branch.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/orm/migrations/0012_use_release_instead_of_up_branch.py
rename to poky/bitbake/lib/toaster/orm/migrations/0012_use_release_instead_of_up_branch.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/orm/migrations/0013_recipe_parse_progress_fields.py b/poky/bitbake/lib/toaster/orm/migrations/0013_recipe_parse_progress_fields.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/orm/migrations/0013_recipe_parse_progress_fields.py
rename to poky/bitbake/lib/toaster/orm/migrations/0013_recipe_parse_progress_fields.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/orm/migrations/0014_allow_empty_buildname.py b/poky/bitbake/lib/toaster/orm/migrations/0014_allow_empty_buildname.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/orm/migrations/0014_allow_empty_buildname.py
rename to poky/bitbake/lib/toaster/orm/migrations/0014_allow_empty_buildname.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/orm/migrations/0015_layer_local_source_dir.py b/poky/bitbake/lib/toaster/orm/migrations/0015_layer_local_source_dir.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/orm/migrations/0015_layer_local_source_dir.py
rename to poky/bitbake/lib/toaster/orm/migrations/0015_layer_local_source_dir.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/orm/migrations/0016_clone_progress.py b/poky/bitbake/lib/toaster/orm/migrations/0016_clone_progress.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/orm/migrations/0016_clone_progress.py
rename to poky/bitbake/lib/toaster/orm/migrations/0016_clone_progress.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/orm/migrations/0017_distro_clone.py b/poky/bitbake/lib/toaster/orm/migrations/0017_distro_clone.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/orm/migrations/0017_distro_clone.py
rename to poky/bitbake/lib/toaster/orm/migrations/0017_distro_clone.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/orm/migrations/__init__.py b/poky/bitbake/lib/toaster/orm/migrations/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/orm/migrations/__init__.py
rename to poky/bitbake/lib/toaster/orm/migrations/__init__.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/orm/models.py b/poky/bitbake/lib/toaster/orm/models.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/orm/models.py
rename to poky/bitbake/lib/toaster/orm/models.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/__init__.py b/poky/bitbake/lib/toaster/tests/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/__init__.py
rename to poky/bitbake/lib/toaster/tests/__init__.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/README b/poky/bitbake/lib/toaster/tests/browser/README
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/README
rename to poky/bitbake/lib/toaster/tests/browser/README
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/__init__.py b/poky/bitbake/lib/toaster/tests/browser/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/__init__.py
rename to poky/bitbake/lib/toaster/tests/browser/__init__.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/selenium_helpers.py b/poky/bitbake/lib/toaster/tests/browser/selenium_helpers.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/selenium_helpers.py
rename to poky/bitbake/lib/toaster/tests/browser/selenium_helpers.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/selenium_helpers_base.py b/poky/bitbake/lib/toaster/tests/browser/selenium_helpers_base.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/selenium_helpers_base.py
rename to poky/bitbake/lib/toaster/tests/browser/selenium_helpers_base.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/test_all_builds_page.py b/poky/bitbake/lib/toaster/tests/browser/test_all_builds_page.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/test_all_builds_page.py
rename to poky/bitbake/lib/toaster/tests/browser/test_all_builds_page.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/test_all_projects_page.py b/poky/bitbake/lib/toaster/tests/browser/test_all_projects_page.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/test_all_projects_page.py
rename to poky/bitbake/lib/toaster/tests/browser/test_all_projects_page.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/test_builddashboard_page.py b/poky/bitbake/lib/toaster/tests/browser/test_builddashboard_page.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/test_builddashboard_page.py
rename to poky/bitbake/lib/toaster/tests/browser/test_builddashboard_page.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/test_builddashboard_page_artifacts.py b/poky/bitbake/lib/toaster/tests/browser/test_builddashboard_page_artifacts.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/test_builddashboard_page_artifacts.py
rename to poky/bitbake/lib/toaster/tests/browser/test_builddashboard_page_artifacts.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/test_builddashboard_page_recipes.py b/poky/bitbake/lib/toaster/tests/browser/test_builddashboard_page_recipes.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/test_builddashboard_page_recipes.py
rename to poky/bitbake/lib/toaster/tests/browser/test_builddashboard_page_recipes.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/test_builddashboard_page_tasks.py b/poky/bitbake/lib/toaster/tests/browser/test_builddashboard_page_tasks.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/test_builddashboard_page_tasks.py
rename to poky/bitbake/lib/toaster/tests/browser/test_builddashboard_page_tasks.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/test_js_unit_tests.py b/poky/bitbake/lib/toaster/tests/browser/test_js_unit_tests.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/test_js_unit_tests.py
rename to poky/bitbake/lib/toaster/tests/browser/test_js_unit_tests.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/test_landing_page.py b/poky/bitbake/lib/toaster/tests/browser/test_landing_page.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/test_landing_page.py
rename to poky/bitbake/lib/toaster/tests/browser/test_landing_page.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/test_layerdetails_page.py b/poky/bitbake/lib/toaster/tests/browser/test_layerdetails_page.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/test_layerdetails_page.py
rename to poky/bitbake/lib/toaster/tests/browser/test_layerdetails_page.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/test_most_recent_builds_states.py b/poky/bitbake/lib/toaster/tests/browser/test_most_recent_builds_states.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/test_most_recent_builds_states.py
rename to poky/bitbake/lib/toaster/tests/browser/test_most_recent_builds_states.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/test_new_custom_image_page.py b/poky/bitbake/lib/toaster/tests/browser/test_new_custom_image_page.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/test_new_custom_image_page.py
rename to poky/bitbake/lib/toaster/tests/browser/test_new_custom_image_page.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/test_new_project_page.py b/poky/bitbake/lib/toaster/tests/browser/test_new_project_page.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/test_new_project_page.py
rename to poky/bitbake/lib/toaster/tests/browser/test_new_project_page.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/test_project_builds_page.py b/poky/bitbake/lib/toaster/tests/browser/test_project_builds_page.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/test_project_builds_page.py
rename to poky/bitbake/lib/toaster/tests/browser/test_project_builds_page.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/test_project_config_page.py b/poky/bitbake/lib/toaster/tests/browser/test_project_config_page.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/test_project_config_page.py
rename to poky/bitbake/lib/toaster/tests/browser/test_project_config_page.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/test_project_page.py b/poky/bitbake/lib/toaster/tests/browser/test_project_page.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/test_project_page.py
rename to poky/bitbake/lib/toaster/tests/browser/test_project_page.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/test_sample.py b/poky/bitbake/lib/toaster/tests/browser/test_sample.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/test_sample.py
rename to poky/bitbake/lib/toaster/tests/browser/test_sample.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/test_task_page.py b/poky/bitbake/lib/toaster/tests/browser/test_task_page.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/test_task_page.py
rename to poky/bitbake/lib/toaster/tests/browser/test_task_page.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/test_toastertable_ui.py b/poky/bitbake/lib/toaster/tests/browser/test_toastertable_ui.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/browser/test_toastertable_ui.py
rename to poky/bitbake/lib/toaster/tests/browser/test_toastertable_ui.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/builds/README b/poky/bitbake/lib/toaster/tests/builds/README
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/builds/README
rename to poky/bitbake/lib/toaster/tests/builds/README
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/builds/__init__.py b/poky/bitbake/lib/toaster/tests/builds/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/builds/__init__.py
rename to poky/bitbake/lib/toaster/tests/builds/__init__.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/builds/buildtest.py b/poky/bitbake/lib/toaster/tests/builds/buildtest.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/builds/buildtest.py
rename to poky/bitbake/lib/toaster/tests/builds/buildtest.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/builds/test_core_image_min.py b/poky/bitbake/lib/toaster/tests/builds/test_core_image_min.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/builds/test_core_image_min.py
rename to poky/bitbake/lib/toaster/tests/builds/test_core_image_min.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/commands/__init__.py b/poky/bitbake/lib/toaster/tests/commands/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/commands/__init__.py
rename to poky/bitbake/lib/toaster/tests/commands/__init__.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/commands/test_loaddata.py b/poky/bitbake/lib/toaster/tests/commands/test_loaddata.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/commands/test_loaddata.py
rename to poky/bitbake/lib/toaster/tests/commands/test_loaddata.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/commands/test_lsupdates.py b/poky/bitbake/lib/toaster/tests/commands/test_lsupdates.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/commands/test_lsupdates.py
rename to poky/bitbake/lib/toaster/tests/commands/test_lsupdates.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/commands/test_runbuilds.py b/poky/bitbake/lib/toaster/tests/commands/test_runbuilds.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/commands/test_runbuilds.py
rename to poky/bitbake/lib/toaster/tests/commands/test_runbuilds.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/db/__init__.py b/poky/bitbake/lib/toaster/tests/db/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/db/__init__.py
rename to poky/bitbake/lib/toaster/tests/db/__init__.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/db/test_db.py b/poky/bitbake/lib/toaster/tests/db/test_db.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/db/test_db.py
rename to poky/bitbake/lib/toaster/tests/db/test_db.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/eventreplay/README b/poky/bitbake/lib/toaster/tests/eventreplay/README
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/eventreplay/README
rename to poky/bitbake/lib/toaster/tests/eventreplay/README
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/eventreplay/__init__.py b/poky/bitbake/lib/toaster/tests/eventreplay/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/eventreplay/__init__.py
rename to poky/bitbake/lib/toaster/tests/eventreplay/__init__.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/functional/README b/poky/bitbake/lib/toaster/tests/functional/README
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/functional/README
rename to poky/bitbake/lib/toaster/tests/functional/README
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/functional/__init__.py b/poky/bitbake/lib/toaster/tests/functional/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/functional/__init__.py
rename to poky/bitbake/lib/toaster/tests/functional/__init__.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/functional/functional_helpers.py b/poky/bitbake/lib/toaster/tests/functional/functional_helpers.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/functional/functional_helpers.py
rename to poky/bitbake/lib/toaster/tests/functional/functional_helpers.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/functional/test_functional_basic.py b/poky/bitbake/lib/toaster/tests/functional/test_functional_basic.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/functional/test_functional_basic.py
rename to poky/bitbake/lib/toaster/tests/functional/test_functional_basic.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/toaster-tests-requirements.txt b/poky/bitbake/lib/toaster/tests/toaster-tests-requirements.txt
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/toaster-tests-requirements.txt
rename to poky/bitbake/lib/toaster/tests/toaster-tests-requirements.txt
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/views/README b/poky/bitbake/lib/toaster/tests/views/README
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/views/README
rename to poky/bitbake/lib/toaster/tests/views/README
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/views/__init__.py b/poky/bitbake/lib/toaster/tests/views/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/views/__init__.py
rename to poky/bitbake/lib/toaster/tests/views/__init__.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/tests/views/test_views.py b/poky/bitbake/lib/toaster/tests/views/test_views.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/tests/views/test_views.py
rename to poky/bitbake/lib/toaster/tests/views/test_views.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/__init__.py b/poky/bitbake/lib/toaster/toastergui/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/__init__.py
rename to poky/bitbake/lib/toaster/toastergui/__init__.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/api.py b/poky/bitbake/lib/toaster/toastergui/api.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/api.py
rename to poky/bitbake/lib/toaster/toastergui/api.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/buildtables.py b/poky/bitbake/lib/toaster/toastergui/buildtables.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/buildtables.py
rename to poky/bitbake/lib/toaster/toastergui/buildtables.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/fixtures/toastergui-unittest-data.xml b/poky/bitbake/lib/toaster/toastergui/fixtures/toastergui-unittest-data.xml
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/fixtures/toastergui-unittest-data.xml
rename to poky/bitbake/lib/toaster/toastergui/fixtures/toastergui-unittest-data.xml
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/bootstrap.css b/poky/bitbake/lib/toaster/toastergui/static/css/bootstrap.css
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/bootstrap.css
rename to poky/bitbake/lib/toaster/toastergui/static/css/bootstrap.css
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/bootstrap.css.map b/poky/bitbake/lib/toaster/toastergui/static/css/bootstrap.css.map
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/bootstrap.css.map
rename to poky/bitbake/lib/toaster/toastergui/static/css/bootstrap.css.map
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/bootstrap.min.css b/poky/bitbake/lib/toaster/toastergui/static/css/bootstrap.min.css
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/bootstrap.min.css
rename to poky/bitbake/lib/toaster/toastergui/static/css/bootstrap.min.css
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/bootstrap.min.css.map b/poky/bitbake/lib/toaster/toastergui/static/css/bootstrap.min.css.map
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/bootstrap.min.css.map
rename to poky/bitbake/lib/toaster/toastergui/static/css/bootstrap.min.css.map
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/bootstrap3-transition.css b/poky/bitbake/lib/toaster/toastergui/static/css/bootstrap3-transition.css
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/bootstrap3-transition.css
rename to poky/bitbake/lib/toaster/toastergui/static/css/bootstrap3-transition.css
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/default.css b/poky/bitbake/lib/toaster/toastergui/static/css/default.css
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/default.css
rename to poky/bitbake/lib/toaster/toastergui/static/css/default.css
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/font-awesome.min.css b/poky/bitbake/lib/toaster/toastergui/static/css/font-awesome.min.css
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/font-awesome.min.css
rename to poky/bitbake/lib/toaster/toastergui/static/css/font-awesome.min.css
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png
rename to poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_diagonals-thick_20_666666_40x40.png b/poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_diagonals-thick_20_666666_40x40.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_diagonals-thick_20_666666_40x40.png
rename to poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_diagonals-thick_20_666666_40x40.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_flat_10_000000_40x100.png b/poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_flat_10_000000_40x100.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_flat_10_000000_40x100.png
rename to poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_flat_10_000000_40x100.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_glass_100_f6f6f6_1x400.png b/poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_glass_100_f6f6f6_1x400.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_glass_100_f6f6f6_1x400.png
rename to poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_glass_100_f6f6f6_1x400.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_glass_100_fdf5ce_1x400.png b/poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_glass_100_fdf5ce_1x400.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_glass_100_fdf5ce_1x400.png
rename to poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_glass_100_fdf5ce_1x400.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_glass_65_ffffff_1x400.png b/poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_glass_65_ffffff_1x400.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_glass_65_ffffff_1x400.png
rename to poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_glass_65_ffffff_1x400.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_gloss-wave_35_f6a828_500x100.png b/poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_gloss-wave_35_f6a828_500x100.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_gloss-wave_35_f6a828_500x100.png
rename to poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_gloss-wave_35_f6a828_500x100.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png b/poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
rename to poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_highlight-soft_75_ffe45c_1x100.png b/poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
rename to poky/bitbake/lib/toaster/toastergui/static/css/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-icons_222222_256x240.png b/poky/bitbake/lib/toaster/toastergui/static/css/images/ui-icons_222222_256x240.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-icons_222222_256x240.png
rename to poky/bitbake/lib/toaster/toastergui/static/css/images/ui-icons_222222_256x240.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-icons_228ef1_256x240.png b/poky/bitbake/lib/toaster/toastergui/static/css/images/ui-icons_228ef1_256x240.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-icons_228ef1_256x240.png
rename to poky/bitbake/lib/toaster/toastergui/static/css/images/ui-icons_228ef1_256x240.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-icons_ef8c08_256x240.png b/poky/bitbake/lib/toaster/toastergui/static/css/images/ui-icons_ef8c08_256x240.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-icons_ef8c08_256x240.png
rename to poky/bitbake/lib/toaster/toastergui/static/css/images/ui-icons_ef8c08_256x240.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-icons_ffd27a_256x240.png b/poky/bitbake/lib/toaster/toastergui/static/css/images/ui-icons_ffd27a_256x240.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-icons_ffd27a_256x240.png
rename to poky/bitbake/lib/toaster/toastergui/static/css/images/ui-icons_ffd27a_256x240.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-icons_ffffff_256x240.png b/poky/bitbake/lib/toaster/toastergui/static/css/images/ui-icons_ffffff_256x240.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/images/ui-icons_ffffff_256x240.png
rename to poky/bitbake/lib/toaster/toastergui/static/css/images/ui-icons_ffffff_256x240.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/jquery-ui.min.css b/poky/bitbake/lib/toaster/toastergui/static/css/jquery-ui.min.css
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/jquery-ui.min.css
rename to poky/bitbake/lib/toaster/toastergui/static/css/jquery-ui.min.css
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/jquery-ui.structure.min.css b/poky/bitbake/lib/toaster/toastergui/static/css/jquery-ui.structure.min.css
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/jquery-ui.structure.min.css
rename to poky/bitbake/lib/toaster/toastergui/static/css/jquery-ui.structure.min.css
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/jquery-ui.theme.min.css b/poky/bitbake/lib/toaster/toastergui/static/css/jquery-ui.theme.min.css
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/jquery-ui.theme.min.css
rename to poky/bitbake/lib/toaster/toastergui/static/css/jquery-ui.theme.min.css
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/jquery.treetable.css b/poky/bitbake/lib/toaster/toastergui/static/css/jquery.treetable.css
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/jquery.treetable.css
rename to poky/bitbake/lib/toaster/toastergui/static/css/jquery.treetable.css
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/jquery.treetable.theme.default.css b/poky/bitbake/lib/toaster/toastergui/static/css/jquery.treetable.theme.default.css
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/jquery.treetable.theme.default.css
rename to poky/bitbake/lib/toaster/toastergui/static/css/jquery.treetable.theme.default.css
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/jquery.treetable.theme.toaster.css b/poky/bitbake/lib/toaster/toastergui/static/css/jquery.treetable.theme.toaster.css
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/jquery.treetable.theme.toaster.css
rename to poky/bitbake/lib/toaster/toastergui/static/css/jquery.treetable.theme.toaster.css
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/qunit-1.18.0.css b/poky/bitbake/lib/toaster/toastergui/static/css/qunit-1.18.0.css
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/qunit-1.18.0.css
rename to poky/bitbake/lib/toaster/toastergui/static/css/qunit-1.18.0.css
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/screen.css b/poky/bitbake/lib/toaster/toastergui/static/css/screen.css
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/css/screen.css
rename to poky/bitbake/lib/toaster/toastergui/static/css/screen.css
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/fonts/FontAwesome.otf b/poky/bitbake/lib/toaster/toastergui/static/fonts/FontAwesome.otf
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/fonts/FontAwesome.otf
rename to poky/bitbake/lib/toaster/toastergui/static/fonts/FontAwesome.otf
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/fonts/fontawesome-webfont.eot b/poky/bitbake/lib/toaster/toastergui/static/fonts/fontawesome-webfont.eot
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/fonts/fontawesome-webfont.eot
rename to poky/bitbake/lib/toaster/toastergui/static/fonts/fontawesome-webfont.eot
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/fonts/fontawesome-webfont.svg b/poky/bitbake/lib/toaster/toastergui/static/fonts/fontawesome-webfont.svg
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/fonts/fontawesome-webfont.svg
rename to poky/bitbake/lib/toaster/toastergui/static/fonts/fontawesome-webfont.svg
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/fonts/fontawesome-webfont.ttf b/poky/bitbake/lib/toaster/toastergui/static/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/fonts/fontawesome-webfont.ttf
rename to poky/bitbake/lib/toaster/toastergui/static/fonts/fontawesome-webfont.ttf
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/fonts/fontawesome-webfont.woff b/poky/bitbake/lib/toaster/toastergui/static/fonts/fontawesome-webfont.woff
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/fonts/fontawesome-webfont.woff
rename to poky/bitbake/lib/toaster/toastergui/static/fonts/fontawesome-webfont.woff
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/fonts/glyphicons-halflings-regular.eot b/poky/bitbake/lib/toaster/toastergui/static/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/fonts/glyphicons-halflings-regular.eot
rename to poky/bitbake/lib/toaster/toastergui/static/fonts/glyphicons-halflings-regular.eot
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/fonts/glyphicons-halflings-regular.svg b/poky/bitbake/lib/toaster/toastergui/static/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/fonts/glyphicons-halflings-regular.svg
rename to poky/bitbake/lib/toaster/toastergui/static/fonts/glyphicons-halflings-regular.svg
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/fonts/glyphicons-halflings-regular.ttf b/poky/bitbake/lib/toaster/toastergui/static/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/fonts/glyphicons-halflings-regular.ttf
rename to poky/bitbake/lib/toaster/toastergui/static/fonts/glyphicons-halflings-regular.ttf
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/fonts/glyphicons-halflings-regular.woff b/poky/bitbake/lib/toaster/toastergui/static/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/fonts/glyphicons-halflings-regular.woff
rename to poky/bitbake/lib/toaster/toastergui/static/fonts/glyphicons-halflings-regular.woff
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/fonts/glyphicons-halflings-regular.woff2 b/poky/bitbake/lib/toaster/toastergui/static/fonts/glyphicons-halflings-regular.woff2
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/fonts/glyphicons-halflings-regular.woff2
rename to poky/bitbake/lib/toaster/toastergui/static/fonts/glyphicons-halflings-regular.woff2
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/html/layer_deps_modal.html b/poky/bitbake/lib/toaster/toastergui/static/html/layer_deps_modal.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/html/layer_deps_modal.html
rename to poky/bitbake/lib/toaster/toastergui/static/html/layer_deps_modal.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/img/logo.png b/poky/bitbake/lib/toaster/toastergui/static/img/logo.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/img/logo.png
rename to poky/bitbake/lib/toaster/toastergui/static/img/logo.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/img/toaster_bw.png b/poky/bitbake/lib/toaster/toastergui/static/img/toaster_bw.png
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/img/toaster_bw.png
rename to poky/bitbake/lib/toaster/toastergui/static/img/toaster_bw.png
Binary files differ
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/jquery-treetable-license/GPL-LICENSE.txt b/poky/bitbake/lib/toaster/toastergui/static/jquery-treetable-license/GPL-LICENSE.txt
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/jquery-treetable-license/GPL-LICENSE.txt
rename to poky/bitbake/lib/toaster/toastergui/static/jquery-treetable-license/GPL-LICENSE.txt
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/jquery-treetable-license/MIT-LICENSE.txt b/poky/bitbake/lib/toaster/toastergui/static/jquery-treetable-license/MIT-LICENSE.txt
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/jquery-treetable-license/MIT-LICENSE.txt
rename to poky/bitbake/lib/toaster/toastergui/static/jquery-treetable-license/MIT-LICENSE.txt
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/jquery-treetable-license/README.md b/poky/bitbake/lib/toaster/toastergui/static/jquery-treetable-license/README.md
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/jquery-treetable-license/README.md
rename to poky/bitbake/lib/toaster/toastergui/static/jquery-treetable-license/README.md
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/jquery.treetable.theme.toaster.css b/poky/bitbake/lib/toaster/toastergui/static/jquery.treetable.theme.toaster.css
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/jquery.treetable.theme.toaster.css
rename to poky/bitbake/lib/toaster/toastergui/static/jquery.treetable.theme.toaster.css
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/.jshintrc b/poky/bitbake/lib/toaster/toastergui/static/js/.jshintrc
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/.jshintrc
rename to poky/bitbake/lib/toaster/toastergui/static/js/.jshintrc
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/bootstrap.js b/poky/bitbake/lib/toaster/toastergui/static/js/bootstrap.js
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/bootstrap.js
rename to poky/bitbake/lib/toaster/toastergui/static/js/bootstrap.js
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/bootstrap.min.js b/poky/bitbake/lib/toaster/toastergui/static/js/bootstrap.min.js
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/bootstrap.min.js
rename to poky/bitbake/lib/toaster/toastergui/static/js/bootstrap.min.js
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/customrecipe.js b/poky/bitbake/lib/toaster/toastergui/static/js/customrecipe.js
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/customrecipe.js
rename to poky/bitbake/lib/toaster/toastergui/static/js/customrecipe.js
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/filtersnippet.js b/poky/bitbake/lib/toaster/toastergui/static/js/filtersnippet.js
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/filtersnippet.js
rename to poky/bitbake/lib/toaster/toastergui/static/js/filtersnippet.js
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/highlight.pack.js b/poky/bitbake/lib/toaster/toastergui/static/js/highlight.pack.js
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/highlight.pack.js
rename to poky/bitbake/lib/toaster/toastergui/static/js/highlight.pack.js
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/importlayer.js b/poky/bitbake/lib/toaster/toastergui/static/js/importlayer.js
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/importlayer.js
rename to poky/bitbake/lib/toaster/toastergui/static/js/importlayer.js
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/jquery-2.0.3.min.js b/poky/bitbake/lib/toaster/toastergui/static/js/jquery-2.0.3.min.js
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/jquery-2.0.3.min.js
rename to poky/bitbake/lib/toaster/toastergui/static/js/jquery-2.0.3.min.js
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/jquery-2.0.3.min.map b/poky/bitbake/lib/toaster/toastergui/static/js/jquery-2.0.3.min.map
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/jquery-2.0.3.min.map
rename to poky/bitbake/lib/toaster/toastergui/static/js/jquery-2.0.3.min.map
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/jquery-ui.min.js b/poky/bitbake/lib/toaster/toastergui/static/js/jquery-ui.min.js
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/jquery-ui.min.js
rename to poky/bitbake/lib/toaster/toastergui/static/js/jquery-ui.min.js
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/jquery.cookie.js b/poky/bitbake/lib/toaster/toastergui/static/js/jquery.cookie.js
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/jquery.cookie.js
rename to poky/bitbake/lib/toaster/toastergui/static/js/jquery.cookie.js
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/jquery.treetable.js b/poky/bitbake/lib/toaster/toastergui/static/js/jquery.treetable.js
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/jquery.treetable.js
rename to poky/bitbake/lib/toaster/toastergui/static/js/jquery.treetable.js
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/jsrender.min.js b/poky/bitbake/lib/toaster/toastergui/static/js/jsrender.min.js
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/jsrender.min.js
rename to poky/bitbake/lib/toaster/toastergui/static/js/jsrender.min.js
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/layerBtn.js b/poky/bitbake/lib/toaster/toastergui/static/js/layerBtn.js
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/layerBtn.js
rename to poky/bitbake/lib/toaster/toastergui/static/js/layerBtn.js
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/layerDepsModal.js b/poky/bitbake/lib/toaster/toastergui/static/js/layerDepsModal.js
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/layerDepsModal.js
rename to poky/bitbake/lib/toaster/toastergui/static/js/layerDepsModal.js
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/layerdetails.js b/poky/bitbake/lib/toaster/toastergui/static/js/layerdetails.js
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/layerdetails.js
rename to poky/bitbake/lib/toaster/toastergui/static/js/layerdetails.js
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/libtoaster.js b/poky/bitbake/lib/toaster/toastergui/static/js/libtoaster.js
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/libtoaster.js
rename to poky/bitbake/lib/toaster/toastergui/static/js/libtoaster.js
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/mrbsection.js b/poky/bitbake/lib/toaster/toastergui/static/js/mrbsection.js
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/mrbsection.js
rename to poky/bitbake/lib/toaster/toastergui/static/js/mrbsection.js
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/newcustomimage_modal.js b/poky/bitbake/lib/toaster/toastergui/static/js/newcustomimage_modal.js
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/newcustomimage_modal.js
rename to poky/bitbake/lib/toaster/toastergui/static/js/newcustomimage_modal.js
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/projectpage.js b/poky/bitbake/lib/toaster/toastergui/static/js/projectpage.js
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/projectpage.js
rename to poky/bitbake/lib/toaster/toastergui/static/js/projectpage.js
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/projecttopbar.js b/poky/bitbake/lib/toaster/toastergui/static/js/projecttopbar.js
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/projecttopbar.js
rename to poky/bitbake/lib/toaster/toastergui/static/js/projecttopbar.js
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/qunit-1.18.0.js b/poky/bitbake/lib/toaster/toastergui/static/js/qunit-1.18.0.js
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/qunit-1.18.0.js
rename to poky/bitbake/lib/toaster/toastergui/static/js/qunit-1.18.0.js
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/recipedetails.js b/poky/bitbake/lib/toaster/toastergui/static/js/recipedetails.js
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/recipedetails.js
rename to poky/bitbake/lib/toaster/toastergui/static/js/recipedetails.js
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/table.js b/poky/bitbake/lib/toaster/toastergui/static/js/table.js
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/table.js
rename to poky/bitbake/lib/toaster/toastergui/static/js/table.js
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/tests/test.js b/poky/bitbake/lib/toaster/toastergui/static/js/tests/test.js
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/tests/test.js
rename to poky/bitbake/lib/toaster/toastergui/static/js/tests/test.js
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/typeahead.jquery.js b/poky/bitbake/lib/toaster/toastergui/static/js/typeahead.jquery.js
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/typeahead.jquery.js
rename to poky/bitbake/lib/toaster/toastergui/static/js/typeahead.jquery.js
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/ui-bootstrap-tpls-0.11.0.js b/poky/bitbake/lib/toaster/toastergui/static/js/ui-bootstrap-tpls-0.11.0.js
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/ui-bootstrap-tpls-0.11.0.js
rename to poky/bitbake/lib/toaster/toastergui/static/js/ui-bootstrap-tpls-0.11.0.js
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/ui-bootstrap-tpls-0.11.0.min.js b/poky/bitbake/lib/toaster/toastergui/static/js/ui-bootstrap-tpls-0.11.0.min.js
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/static/js/ui-bootstrap-tpls-0.11.0.min.js
rename to poky/bitbake/lib/toaster/toastergui/static/js/ui-bootstrap-tpls-0.11.0.min.js
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/tablefilter.py b/poky/bitbake/lib/toaster/toastergui/tablefilter.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/tablefilter.py
rename to poky/bitbake/lib/toaster/toastergui/tablefilter.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/tables.py b/poky/bitbake/lib/toaster/toastergui/tables.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/tables.py
rename to poky/bitbake/lib/toaster/toastergui/tables.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/base.html b/poky/bitbake/lib/toaster/toastergui/templates/base.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/base.html
rename to poky/bitbake/lib/toaster/toastergui/templates/base.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/basebuilddetailpage.html b/poky/bitbake/lib/toaster/toastergui/templates/basebuilddetailpage.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/basebuilddetailpage.html
rename to poky/bitbake/lib/toaster/toastergui/templates/basebuilddetailpage.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/basebuildpage.html b/poky/bitbake/lib/toaster/toastergui/templates/basebuildpage.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/basebuildpage.html
rename to poky/bitbake/lib/toaster/toastergui/templates/basebuildpage.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/baseprojectbuildspage.html b/poky/bitbake/lib/toaster/toastergui/templates/baseprojectbuildspage.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/baseprojectbuildspage.html
rename to poky/bitbake/lib/toaster/toastergui/templates/baseprojectbuildspage.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html b/poky/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html
rename to poky/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/basetable_bottom.html b/poky/bitbake/lib/toaster/toastergui/templates/basetable_bottom.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/basetable_bottom.html
rename to poky/bitbake/lib/toaster/toastergui/templates/basetable_bottom.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/basetable_top.html b/poky/bitbake/lib/toaster/toastergui/templates/basetable_top.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/basetable_top.html
rename to poky/bitbake/lib/toaster/toastergui/templates/basetable_top.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/basetable_top_layers.html b/poky/bitbake/lib/toaster/toastergui/templates/basetable_top_layers.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/basetable_top_layers.html
rename to poky/bitbake/lib/toaster/toastergui/templates/basetable_top_layers.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/bfile.html b/poky/bitbake/lib/toaster/toastergui/templates/bfile.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/bfile.html
rename to poky/bitbake/lib/toaster/toastergui/templates/bfile.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/brtargets.html b/poky/bitbake/lib/toaster/toastergui/templates/brtargets.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/brtargets.html
rename to poky/bitbake/lib/toaster/toastergui/templates/brtargets.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/builddashboard.html b/poky/bitbake/lib/toaster/toastergui/templates/builddashboard.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/builddashboard.html
rename to poky/bitbake/lib/toaster/toastergui/templates/builddashboard.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/buildinfo-toastertable.html b/poky/bitbake/lib/toaster/toastergui/templates/buildinfo-toastertable.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/buildinfo-toastertable.html
rename to poky/bitbake/lib/toaster/toastergui/templates/buildinfo-toastertable.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/builds-toastertable.html b/poky/bitbake/lib/toaster/toastergui/templates/builds-toastertable.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/builds-toastertable.html
rename to poky/bitbake/lib/toaster/toastergui/templates/builds-toastertable.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/configuration.html b/poky/bitbake/lib/toaster/toastergui/templates/configuration.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/configuration.html
rename to poky/bitbake/lib/toaster/toastergui/templates/configuration.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/configvars.html b/poky/bitbake/lib/toaster/toastergui/templates/configvars.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/configvars.html
rename to poky/bitbake/lib/toaster/toastergui/templates/configvars.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/cpuusage.html b/poky/bitbake/lib/toaster/toastergui/templates/cpuusage.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/cpuusage.html
rename to poky/bitbake/lib/toaster/toastergui/templates/cpuusage.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/customise_btn.html b/poky/bitbake/lib/toaster/toastergui/templates/customise_btn.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/customise_btn.html
rename to poky/bitbake/lib/toaster/toastergui/templates/customise_btn.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/customrecipe.html b/poky/bitbake/lib/toaster/toastergui/templates/customrecipe.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/customrecipe.html
rename to poky/bitbake/lib/toaster/toastergui/templates/customrecipe.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/detail_pagination_bottom.html b/poky/bitbake/lib/toaster/toastergui/templates/detail_pagination_bottom.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/detail_pagination_bottom.html
rename to poky/bitbake/lib/toaster/toastergui/templates/detail_pagination_bottom.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/detail_search_header.html b/poky/bitbake/lib/toaster/toastergui/templates/detail_search_header.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/detail_search_header.html
rename to poky/bitbake/lib/toaster/toastergui/templates/detail_search_header.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/detail_sorted_header.html b/poky/bitbake/lib/toaster/toastergui/templates/detail_sorted_header.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/detail_sorted_header.html
rename to poky/bitbake/lib/toaster/toastergui/templates/detail_sorted_header.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/dirinfo.html b/poky/bitbake/lib/toaster/toastergui/templates/dirinfo.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/dirinfo.html
rename to poky/bitbake/lib/toaster/toastergui/templates/dirinfo.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/diskio.html b/poky/bitbake/lib/toaster/toastergui/templates/diskio.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/diskio.html
rename to poky/bitbake/lib/toaster/toastergui/templates/diskio.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/distro_btn.html b/poky/bitbake/lib/toaster/toastergui/templates/distro_btn.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/distro_btn.html
rename to poky/bitbake/lib/toaster/toastergui/templates/distro_btn.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/editcustomimage_modal.html b/poky/bitbake/lib/toaster/toastergui/templates/editcustomimage_modal.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/editcustomimage_modal.html
rename to poky/bitbake/lib/toaster/toastergui/templates/editcustomimage_modal.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/filtersnippet.html b/poky/bitbake/lib/toaster/toastergui/templates/filtersnippet.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/filtersnippet.html
rename to poky/bitbake/lib/toaster/toastergui/templates/filtersnippet.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/generic-toastertable-page.html b/poky/bitbake/lib/toaster/toastergui/templates/generic-toastertable-page.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/generic-toastertable-page.html
rename to poky/bitbake/lib/toaster/toastergui/templates/generic-toastertable-page.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/health.html b/poky/bitbake/lib/toaster/toastergui/templates/health.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/health.html
rename to poky/bitbake/lib/toaster/toastergui/templates/health.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/importlayer.html b/poky/bitbake/lib/toaster/toastergui/templates/importlayer.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/importlayer.html
rename to poky/bitbake/lib/toaster/toastergui/templates/importlayer.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/js-unit-tests.html b/poky/bitbake/lib/toaster/toastergui/templates/js-unit-tests.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/js-unit-tests.html
rename to poky/bitbake/lib/toaster/toastergui/templates/js-unit-tests.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/landing.html b/poky/bitbake/lib/toaster/toastergui/templates/landing.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/landing.html
rename to poky/bitbake/lib/toaster/toastergui/templates/landing.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/landing_not_managed.html b/poky/bitbake/lib/toaster/toastergui/templates/landing_not_managed.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/landing_not_managed.html
rename to poky/bitbake/lib/toaster/toastergui/templates/landing_not_managed.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/layer_btn.html b/poky/bitbake/lib/toaster/toastergui/templates/layer_btn.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/layer_btn.html
rename to poky/bitbake/lib/toaster/toastergui/templates/layer_btn.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/layerdetails.html b/poky/bitbake/lib/toaster/toastergui/templates/layerdetails.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/layerdetails.html
rename to poky/bitbake/lib/toaster/toastergui/templates/layerdetails.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/machine_btn.html b/poky/bitbake/lib/toaster/toastergui/templates/machine_btn.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/machine_btn.html
rename to poky/bitbake/lib/toaster/toastergui/templates/machine_btn.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/mrb_section.html b/poky/bitbake/lib/toaster/toastergui/templates/mrb_section.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/mrb_section.html
rename to poky/bitbake/lib/toaster/toastergui/templates/mrb_section.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/newcustomimage.html b/poky/bitbake/lib/toaster/toastergui/templates/newcustomimage.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/newcustomimage.html
rename to poky/bitbake/lib/toaster/toastergui/templates/newcustomimage.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/newcustomimage_modal.html b/poky/bitbake/lib/toaster/toastergui/templates/newcustomimage_modal.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/newcustomimage_modal.html
rename to poky/bitbake/lib/toaster/toastergui/templates/newcustomimage_modal.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/newproject.html b/poky/bitbake/lib/toaster/toastergui/templates/newproject.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/newproject.html
rename to poky/bitbake/lib/toaster/toastergui/templates/newproject.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/package_built_dependencies.html b/poky/bitbake/lib/toaster/toastergui/templates/package_built_dependencies.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/package_built_dependencies.html
rename to poky/bitbake/lib/toaster/toastergui/templates/package_built_dependencies.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/package_built_detail.html b/poky/bitbake/lib/toaster/toastergui/templates/package_built_detail.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/package_built_detail.html
rename to poky/bitbake/lib/toaster/toastergui/templates/package_built_detail.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/package_detail_base.html b/poky/bitbake/lib/toaster/toastergui/templates/package_detail_base.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/package_detail_base.html
rename to poky/bitbake/lib/toaster/toastergui/templates/package_detail_base.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/package_included_dependencies.html b/poky/bitbake/lib/toaster/toastergui/templates/package_included_dependencies.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/package_included_dependencies.html
rename to poky/bitbake/lib/toaster/toastergui/templates/package_included_dependencies.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/package_included_detail.html b/poky/bitbake/lib/toaster/toastergui/templates/package_included_detail.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/package_included_detail.html
rename to poky/bitbake/lib/toaster/toastergui/templates/package_included_detail.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/package_included_reverse_dependencies.html b/poky/bitbake/lib/toaster/toastergui/templates/package_included_reverse_dependencies.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/package_included_reverse_dependencies.html
rename to poky/bitbake/lib/toaster/toastergui/templates/package_included_reverse_dependencies.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/package_included_tabs.html b/poky/bitbake/lib/toaster/toastergui/templates/package_included_tabs.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/package_included_tabs.html
rename to poky/bitbake/lib/toaster/toastergui/templates/package_included_tabs.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/pkg_add_rm_btn.html b/poky/bitbake/lib/toaster/toastergui/templates/pkg_add_rm_btn.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/pkg_add_rm_btn.html
rename to poky/bitbake/lib/toaster/toastergui/templates/pkg_add_rm_btn.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/project.html b/poky/bitbake/lib/toaster/toastergui/templates/project.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/project.html
rename to poky/bitbake/lib/toaster/toastergui/templates/project.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/projectbuilds-toastertable.html b/poky/bitbake/lib/toaster/toastergui/templates/projectbuilds-toastertable.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/projectbuilds-toastertable.html
rename to poky/bitbake/lib/toaster/toastergui/templates/projectbuilds-toastertable.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/projectbuilds.html b/poky/bitbake/lib/toaster/toastergui/templates/projectbuilds.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/projectbuilds.html
rename to poky/bitbake/lib/toaster/toastergui/templates/projectbuilds.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/projectconf.html b/poky/bitbake/lib/toaster/toastergui/templates/projectconf.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/projectconf.html
rename to poky/bitbake/lib/toaster/toastergui/templates/projectconf.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/projects-toastertable.html b/poky/bitbake/lib/toaster/toastergui/templates/projects-toastertable.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/projects-toastertable.html
rename to poky/bitbake/lib/toaster/toastergui/templates/projects-toastertable.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/projecttopbar.html b/poky/bitbake/lib/toaster/toastergui/templates/projecttopbar.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/projecttopbar.html
rename to poky/bitbake/lib/toaster/toastergui/templates/projecttopbar.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/recipe.html b/poky/bitbake/lib/toaster/toastergui/templates/recipe.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/recipe.html
rename to poky/bitbake/lib/toaster/toastergui/templates/recipe.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/recipe_btn.html b/poky/bitbake/lib/toaster/toastergui/templates/recipe_btn.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/recipe_btn.html
rename to poky/bitbake/lib/toaster/toastergui/templates/recipe_btn.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/recipe_packages.html b/poky/bitbake/lib/toaster/toastergui/templates/recipe_packages.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/recipe_packages.html
rename to poky/bitbake/lib/toaster/toastergui/templates/recipe_packages.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/recipedetails.html b/poky/bitbake/lib/toaster/toastergui/templates/recipedetails.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/recipedetails.html
rename to poky/bitbake/lib/toaster/toastergui/templates/recipedetails.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/snippets/gitrev_popover.html b/poky/bitbake/lib/toaster/toastergui/templates/snippets/gitrev_popover.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/snippets/gitrev_popover.html
rename to poky/bitbake/lib/toaster/toastergui/templates/snippets/gitrev_popover.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/snippets/pkg_dependencies_popover.html b/poky/bitbake/lib/toaster/toastergui/templates/snippets/pkg_dependencies_popover.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/snippets/pkg_dependencies_popover.html
rename to poky/bitbake/lib/toaster/toastergui/templates/snippets/pkg_dependencies_popover.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/snippets/pkg_revdependencies_popover.html b/poky/bitbake/lib/toaster/toastergui/templates/snippets/pkg_revdependencies_popover.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/snippets/pkg_revdependencies_popover.html
rename to poky/bitbake/lib/toaster/toastergui/templates/snippets/pkg_revdependencies_popover.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/tablesort.html b/poky/bitbake/lib/toaster/toastergui/templates/tablesort.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/tablesort.html
rename to poky/bitbake/lib/toaster/toastergui/templates/tablesort.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/target.html b/poky/bitbake/lib/toaster/toastergui/templates/target.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/target.html
rename to poky/bitbake/lib/toaster/toastergui/templates/target.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/task.html b/poky/bitbake/lib/toaster/toastergui/templates/task.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/task.html
rename to poky/bitbake/lib/toaster/toastergui/templates/task.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/toastertable-filter.html b/poky/bitbake/lib/toaster/toastergui/templates/toastertable-filter.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/toastertable-filter.html
rename to poky/bitbake/lib/toaster/toastergui/templates/toastertable-filter.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/toastertable-simple.html b/poky/bitbake/lib/toaster/toastergui/templates/toastertable-simple.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/toastertable-simple.html
rename to poky/bitbake/lib/toaster/toastergui/templates/toastertable-simple.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/toastertable.html b/poky/bitbake/lib/toaster/toastergui/templates/toastertable.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/toastertable.html
rename to poky/bitbake/lib/toaster/toastergui/templates/toastertable.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/unavailable_artifact.html b/poky/bitbake/lib/toaster/toastergui/templates/unavailable_artifact.html
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/unavailable_artifact.html
rename to poky/bitbake/lib/toaster/toastergui/templates/unavailable_artifact.html
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templatetags/__init__.py b/poky/bitbake/lib/toaster/toastergui/templatetags/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templatetags/__init__.py
rename to poky/bitbake/lib/toaster/toastergui/templatetags/__init__.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templatetags/field_values_filter.py b/poky/bitbake/lib/toaster/toastergui/templatetags/field_values_filter.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templatetags/field_values_filter.py
rename to poky/bitbake/lib/toaster/toastergui/templatetags/field_values_filter.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templatetags/objects_to_dictionaries_filter.py b/poky/bitbake/lib/toaster/toastergui/templatetags/objects_to_dictionaries_filter.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templatetags/objects_to_dictionaries_filter.py
rename to poky/bitbake/lib/toaster/toastergui/templatetags/objects_to_dictionaries_filter.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templatetags/project_url_tag.py b/poky/bitbake/lib/toaster/toastergui/templatetags/project_url_tag.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templatetags/project_url_tag.py
rename to poky/bitbake/lib/toaster/toastergui/templatetags/project_url_tag.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templatetags/projecttags.py b/poky/bitbake/lib/toaster/toastergui/templatetags/projecttags.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templatetags/projecttags.py
rename to poky/bitbake/lib/toaster/toastergui/templatetags/projecttags.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/typeaheads.py b/poky/bitbake/lib/toaster/toastergui/typeaheads.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/typeaheads.py
rename to poky/bitbake/lib/toaster/toastergui/typeaheads.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/urls.py b/poky/bitbake/lib/toaster/toastergui/urls.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/urls.py
rename to poky/bitbake/lib/toaster/toastergui/urls.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/views.py b/poky/bitbake/lib/toaster/toastergui/views.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/views.py
rename to poky/bitbake/lib/toaster/toastergui/views.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/widgets.py b/poky/bitbake/lib/toaster/toastergui/widgets.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastergui/widgets.py
rename to poky/bitbake/lib/toaster/toastergui/widgets.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastermain/__init__.py b/poky/bitbake/lib/toaster/toastermain/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastermain/__init__.py
rename to poky/bitbake/lib/toaster/toastermain/__init__.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastermain/management/__init__.py b/poky/bitbake/lib/toaster/toastermain/management/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastermain/management/__init__.py
rename to poky/bitbake/lib/toaster/toastermain/management/__init__.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastermain/management/commands/__init__.py b/poky/bitbake/lib/toaster/toastermain/management/commands/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastermain/management/commands/__init__.py
rename to poky/bitbake/lib/toaster/toastermain/management/commands/__init__.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastermain/management/commands/builddelete.py b/poky/bitbake/lib/toaster/toastermain/management/commands/builddelete.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastermain/management/commands/builddelete.py
rename to poky/bitbake/lib/toaster/toastermain/management/commands/builddelete.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastermain/management/commands/buildslist.py b/poky/bitbake/lib/toaster/toastermain/management/commands/buildslist.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastermain/management/commands/buildslist.py
rename to poky/bitbake/lib/toaster/toastermain/management/commands/buildslist.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastermain/management/commands/checksocket.py b/poky/bitbake/lib/toaster/toastermain/management/commands/checksocket.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastermain/management/commands/checksocket.py
rename to poky/bitbake/lib/toaster/toastermain/management/commands/checksocket.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastermain/management/commands/perf.py b/poky/bitbake/lib/toaster/toastermain/management/commands/perf.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastermain/management/commands/perf.py
rename to poky/bitbake/lib/toaster/toastermain/management/commands/perf.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastermain/settings.py b/poky/bitbake/lib/toaster/toastermain/settings.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastermain/settings.py
rename to poky/bitbake/lib/toaster/toastermain/settings.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastermain/settings_production_example.py b/poky/bitbake/lib/toaster/toastermain/settings_production_example.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastermain/settings_production_example.py
rename to poky/bitbake/lib/toaster/toastermain/settings_production_example.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastermain/settings_test.py b/poky/bitbake/lib/toaster/toastermain/settings_test.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastermain/settings_test.py
rename to poky/bitbake/lib/toaster/toastermain/settings_test.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastermain/urls.py b/poky/bitbake/lib/toaster/toastermain/urls.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastermain/urls.py
rename to poky/bitbake/lib/toaster/toastermain/urls.py
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastermain/wsgi.py b/poky/bitbake/lib/toaster/toastermain/wsgi.py
similarity index 100%
rename from import-layers/yocto-poky/bitbake/lib/toaster/toastermain/wsgi.py
rename to poky/bitbake/lib/toaster/toastermain/wsgi.py
diff --git a/import-layers/yocto-poky/bitbake/toaster-requirements.txt b/poky/bitbake/toaster-requirements.txt
similarity index 100%
rename from import-layers/yocto-poky/bitbake/toaster-requirements.txt
rename to poky/bitbake/toaster-requirements.txt
diff --git a/import-layers/yocto-poky/documentation/Makefile b/poky/documentation/Makefile
similarity index 100%
rename from import-layers/yocto-poky/documentation/Makefile
rename to poky/documentation/Makefile
diff --git a/import-layers/yocto-poky/documentation/README b/poky/documentation/README
similarity index 100%
rename from import-layers/yocto-poky/documentation/README
rename to poky/documentation/README
diff --git a/import-layers/yocto-poky/documentation/adt-manual/adt-command.xml b/poky/documentation/adt-manual/adt-command.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/adt-manual/adt-command.xml
rename to poky/documentation/adt-manual/adt-command.xml
diff --git a/import-layers/yocto-poky/documentation/adt-manual/adt-intro.xml b/poky/documentation/adt-manual/adt-intro.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/adt-manual/adt-intro.xml
rename to poky/documentation/adt-manual/adt-intro.xml
diff --git a/import-layers/yocto-poky/documentation/adt-manual/adt-manual-customization.xsl b/poky/documentation/adt-manual/adt-manual-customization.xsl
similarity index 100%
rename from import-layers/yocto-poky/documentation/adt-manual/adt-manual-customization.xsl
rename to poky/documentation/adt-manual/adt-manual-customization.xsl
diff --git a/import-layers/yocto-poky/documentation/adt-manual/adt-manual-eclipse-customization.xsl b/poky/documentation/adt-manual/adt-manual-eclipse-customization.xsl
similarity index 100%
rename from import-layers/yocto-poky/documentation/adt-manual/adt-manual-eclipse-customization.xsl
rename to poky/documentation/adt-manual/adt-manual-eclipse-customization.xsl
diff --git a/import-layers/yocto-poky/documentation/adt-manual/adt-manual-intro.xml b/poky/documentation/adt-manual/adt-manual-intro.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/adt-manual/adt-manual-intro.xml
rename to poky/documentation/adt-manual/adt-manual-intro.xml
diff --git a/import-layers/yocto-poky/documentation/adt-manual/adt-manual.xml b/poky/documentation/adt-manual/adt-manual.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/adt-manual/adt-manual.xml
rename to poky/documentation/adt-manual/adt-manual.xml
diff --git a/import-layers/yocto-poky/documentation/adt-manual/adt-package.xml b/poky/documentation/adt-manual/adt-package.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/adt-manual/adt-package.xml
rename to poky/documentation/adt-manual/adt-package.xml
diff --git a/import-layers/yocto-poky/documentation/adt-manual/adt-prepare.xml b/poky/documentation/adt-manual/adt-prepare.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/adt-manual/adt-prepare.xml
rename to poky/documentation/adt-manual/adt-prepare.xml
diff --git a/import-layers/yocto-poky/documentation/adt-manual/adt-style.css b/poky/documentation/adt-manual/adt-style.css
similarity index 100%
rename from import-layers/yocto-poky/documentation/adt-manual/adt-style.css
rename to poky/documentation/adt-manual/adt-style.css
diff --git a/import-layers/yocto-poky/documentation/adt-manual/figures/adt-title.png b/poky/documentation/adt-manual/figures/adt-title.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/adt-manual/figures/adt-title.png
rename to poky/documentation/adt-manual/figures/adt-title.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/adt-manual/figures/using-a-pre-built-image.png b/poky/documentation/adt-manual/figures/using-a-pre-built-image.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/adt-manual/figures/using-a-pre-built-image.png
rename to poky/documentation/adt-manual/figures/using-a-pre-built-image.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs-customization.xsl b/poky/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs-customization.xsl
similarity index 100%
rename from import-layers/yocto-poky/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs-customization.xsl
rename to poky/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs-customization.xsl
diff --git a/import-layers/yocto-poky/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs-eclipse-customization.xsl b/poky/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs-eclipse-customization.xsl
similarity index 100%
rename from import-layers/yocto-poky/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs-eclipse-customization.xsl
rename to poky/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs-eclipse-customization.xsl
diff --git a/import-layers/yocto-poky/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs-style.css b/poky/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs-style.css
similarity index 100%
rename from import-layers/yocto-poky/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs-style.css
rename to poky/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs-style.css
diff --git a/import-layers/yocto-poky/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs-titlepage.xsl b/poky/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs-titlepage.xsl
similarity index 100%
rename from import-layers/yocto-poky/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs-titlepage.xsl
rename to poky/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs-titlepage.xsl
diff --git a/import-layers/yocto-poky/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs.xml b/poky/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs.xml
rename to poky/documentation/brief-yoctoprojectqs/brief-yoctoprojectqs.xml
diff --git a/import-layers/yocto-poky/documentation/brief-yoctoprojectqs/figures/bypqs-title.png b/poky/documentation/brief-yoctoprojectqs/figures/bypqs-title.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/brief-yoctoprojectqs/figures/bypqs-title.png
rename to poky/documentation/brief-yoctoprojectqs/figures/bypqs-title.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/brief-yoctoprojectqs/figures/yocto-project-transp.png b/poky/documentation/brief-yoctoprojectqs/figures/yocto-project-transp.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/brief-yoctoprojectqs/figures/yocto-project-transp.png
rename to poky/documentation/brief-yoctoprojectqs/figures/yocto-project-transp.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/bsp-guide/bsp-guide-customization.xsl b/poky/documentation/bsp-guide/bsp-guide-customization.xsl
similarity index 100%
rename from import-layers/yocto-poky/documentation/bsp-guide/bsp-guide-customization.xsl
rename to poky/documentation/bsp-guide/bsp-guide-customization.xsl
diff --git a/import-layers/yocto-poky/documentation/bsp-guide/bsp-guide-eclipse-customization.xsl b/poky/documentation/bsp-guide/bsp-guide-eclipse-customization.xsl
similarity index 100%
rename from import-layers/yocto-poky/documentation/bsp-guide/bsp-guide-eclipse-customization.xsl
rename to poky/documentation/bsp-guide/bsp-guide-eclipse-customization.xsl
diff --git a/import-layers/yocto-poky/documentation/bsp-guide/bsp-guide.xml b/poky/documentation/bsp-guide/bsp-guide.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/bsp-guide/bsp-guide.xml
rename to poky/documentation/bsp-guide/bsp-guide.xml
diff --git a/import-layers/yocto-poky/documentation/bsp-guide/bsp-style.css b/poky/documentation/bsp-guide/bsp-style.css
similarity index 100%
rename from import-layers/yocto-poky/documentation/bsp-guide/bsp-style.css
rename to poky/documentation/bsp-guide/bsp-style.css
diff --git a/import-layers/yocto-poky/documentation/bsp-guide/bsp.xml b/poky/documentation/bsp-guide/bsp.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/bsp-guide/bsp.xml
rename to poky/documentation/bsp-guide/bsp.xml
diff --git a/import-layers/yocto-poky/documentation/bsp-guide/figures/bsp-dev-flow.png b/poky/documentation/bsp-guide/figures/bsp-dev-flow.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/bsp-guide/figures/bsp-dev-flow.png
rename to poky/documentation/bsp-guide/figures/bsp-dev-flow.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/bsp-guide/figures/bsp-title.png b/poky/documentation/bsp-guide/figures/bsp-title.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/bsp-guide/figures/bsp-title.png
rename to poky/documentation/bsp-guide/figures/bsp-title.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/dev-manual/dev-manual-common-tasks.xml b/poky/documentation/dev-manual/dev-manual-common-tasks.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/dev-manual/dev-manual-common-tasks.xml
rename to poky/documentation/dev-manual/dev-manual-common-tasks.xml
diff --git a/import-layers/yocto-poky/documentation/dev-manual/dev-manual-customization.xsl b/poky/documentation/dev-manual/dev-manual-customization.xsl
similarity index 100%
rename from import-layers/yocto-poky/documentation/dev-manual/dev-manual-customization.xsl
rename to poky/documentation/dev-manual/dev-manual-customization.xsl
diff --git a/import-layers/yocto-poky/documentation/dev-manual/dev-manual-eclipse-customization.xsl b/poky/documentation/dev-manual/dev-manual-eclipse-customization.xsl
similarity index 100%
rename from import-layers/yocto-poky/documentation/dev-manual/dev-manual-eclipse-customization.xsl
rename to poky/documentation/dev-manual/dev-manual-eclipse-customization.xsl
diff --git a/import-layers/yocto-poky/documentation/dev-manual/dev-manual-intro.xml b/poky/documentation/dev-manual/dev-manual-intro.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/dev-manual/dev-manual-intro.xml
rename to poky/documentation/dev-manual/dev-manual-intro.xml
diff --git a/import-layers/yocto-poky/documentation/dev-manual/dev-manual-qemu.xml b/poky/documentation/dev-manual/dev-manual-qemu.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/dev-manual/dev-manual-qemu.xml
rename to poky/documentation/dev-manual/dev-manual-qemu.xml
diff --git a/import-layers/yocto-poky/documentation/dev-manual/dev-manual-start.xml b/poky/documentation/dev-manual/dev-manual-start.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/dev-manual/dev-manual-start.xml
rename to poky/documentation/dev-manual/dev-manual-start.xml
diff --git a/import-layers/yocto-poky/documentation/dev-manual/dev-manual.xml b/poky/documentation/dev-manual/dev-manual.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/dev-manual/dev-manual.xml
rename to poky/documentation/dev-manual/dev-manual.xml
diff --git a/import-layers/yocto-poky/documentation/dev-manual/dev-style.css b/poky/documentation/dev-manual/dev-style.css
similarity index 100%
rename from import-layers/yocto-poky/documentation/dev-manual/dev-style.css
rename to poky/documentation/dev-manual/dev-style.css
diff --git a/import-layers/yocto-poky/documentation/dev-manual/figures/bitbake-build-flow.png b/poky/documentation/dev-manual/figures/bitbake-build-flow.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/dev-manual/figures/bitbake-build-flow.png
rename to poky/documentation/dev-manual/figures/bitbake-build-flow.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/dev-manual/figures/buildhistory-web.png b/poky/documentation/dev-manual/figures/buildhistory-web.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/dev-manual/figures/buildhistory-web.png
rename to poky/documentation/dev-manual/figures/buildhistory-web.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/dev-manual/figures/buildhistory.png b/poky/documentation/dev-manual/figures/buildhistory.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/dev-manual/figures/buildhistory.png
rename to poky/documentation/dev-manual/figures/buildhistory.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/dev-manual/figures/dev-title.png b/poky/documentation/dev-manual/figures/dev-title.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/dev-manual/figures/dev-title.png
rename to poky/documentation/dev-manual/figures/dev-title.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/dev-manual/figures/recipe-workflow.png b/poky/documentation/dev-manual/figures/recipe-workflow.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/dev-manual/figures/recipe-workflow.png
rename to poky/documentation/dev-manual/figures/recipe-workflow.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/kernel-dev/figures/kernel-architecture-overview.png b/poky/documentation/kernel-dev/figures/kernel-architecture-overview.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/kernel-dev/figures/kernel-architecture-overview.png
rename to poky/documentation/kernel-dev/figures/kernel-architecture-overview.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/kernel-dev/figures/kernel-dev-flow.png b/poky/documentation/kernel-dev/figures/kernel-dev-flow.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/kernel-dev/figures/kernel-dev-flow.png
rename to poky/documentation/kernel-dev/figures/kernel-dev-flow.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/kernel-dev/figures/kernel-dev-title.png b/poky/documentation/kernel-dev/figures/kernel-dev-title.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/kernel-dev/figures/kernel-dev-title.png
rename to poky/documentation/kernel-dev/figures/kernel-dev-title.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/kernel-dev/figures/kernel-overview-2-generic.png b/poky/documentation/kernel-dev/figures/kernel-overview-2-generic.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/kernel-dev/figures/kernel-overview-2-generic.png
rename to poky/documentation/kernel-dev/figures/kernel-overview-2-generic.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/kernel-dev/kernel-dev-advanced.xml b/poky/documentation/kernel-dev/kernel-dev-advanced.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/kernel-dev/kernel-dev-advanced.xml
rename to poky/documentation/kernel-dev/kernel-dev-advanced.xml
diff --git a/import-layers/yocto-poky/documentation/kernel-dev/kernel-dev-common.xml b/poky/documentation/kernel-dev/kernel-dev-common.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/kernel-dev/kernel-dev-common.xml
rename to poky/documentation/kernel-dev/kernel-dev-common.xml
diff --git a/import-layers/yocto-poky/documentation/kernel-dev/kernel-dev-concepts-appx.xml b/poky/documentation/kernel-dev/kernel-dev-concepts-appx.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/kernel-dev/kernel-dev-concepts-appx.xml
rename to poky/documentation/kernel-dev/kernel-dev-concepts-appx.xml
diff --git a/import-layers/yocto-poky/documentation/kernel-dev/kernel-dev-customization.xsl b/poky/documentation/kernel-dev/kernel-dev-customization.xsl
similarity index 100%
rename from import-layers/yocto-poky/documentation/kernel-dev/kernel-dev-customization.xsl
rename to poky/documentation/kernel-dev/kernel-dev-customization.xsl
diff --git a/import-layers/yocto-poky/documentation/kernel-dev/kernel-dev-eclipse-customization.xsl b/poky/documentation/kernel-dev/kernel-dev-eclipse-customization.xsl
similarity index 100%
rename from import-layers/yocto-poky/documentation/kernel-dev/kernel-dev-eclipse-customization.xsl
rename to poky/documentation/kernel-dev/kernel-dev-eclipse-customization.xsl
diff --git a/import-layers/yocto-poky/documentation/kernel-dev/kernel-dev-faq.xml b/poky/documentation/kernel-dev/kernel-dev-faq.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/kernel-dev/kernel-dev-faq.xml
rename to poky/documentation/kernel-dev/kernel-dev-faq.xml
diff --git a/import-layers/yocto-poky/documentation/kernel-dev/kernel-dev-intro.xml b/poky/documentation/kernel-dev/kernel-dev-intro.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/kernel-dev/kernel-dev-intro.xml
rename to poky/documentation/kernel-dev/kernel-dev-intro.xml
diff --git a/import-layers/yocto-poky/documentation/kernel-dev/kernel-dev-maint-appx.xml b/poky/documentation/kernel-dev/kernel-dev-maint-appx.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/kernel-dev/kernel-dev-maint-appx.xml
rename to poky/documentation/kernel-dev/kernel-dev-maint-appx.xml
diff --git a/import-layers/yocto-poky/documentation/kernel-dev/kernel-dev-style.css b/poky/documentation/kernel-dev/kernel-dev-style.css
similarity index 100%
rename from import-layers/yocto-poky/documentation/kernel-dev/kernel-dev-style.css
rename to poky/documentation/kernel-dev/kernel-dev-style.css
diff --git a/import-layers/yocto-poky/documentation/kernel-dev/kernel-dev.xml b/poky/documentation/kernel-dev/kernel-dev.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/kernel-dev/kernel-dev.xml
rename to poky/documentation/kernel-dev/kernel-dev.xml
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/YP-flow-diagram.png b/poky/documentation/mega-manual/figures/YP-flow-diagram.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/YP-flow-diagram.png
rename to poky/documentation/mega-manual/figures/YP-flow-diagram.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/add-variable.png b/poky/documentation/mega-manual/figures/add-variable.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/add-variable.png
rename to poky/documentation/mega-manual/figures/add-variable.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/analysis-for-package-splitting.png b/poky/documentation/mega-manual/figures/analysis-for-package-splitting.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/analysis-for-package-splitting.png
rename to poky/documentation/mega-manual/figures/analysis-for-package-splitting.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/bash-oecore.png b/poky/documentation/mega-manual/figures/bash-oecore.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/bash-oecore.png
rename to poky/documentation/mega-manual/figures/bash-oecore.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/bitbake-build-flow.png b/poky/documentation/mega-manual/figures/bitbake-build-flow.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/bitbake-build-flow.png
rename to poky/documentation/mega-manual/figures/bitbake-build-flow.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/bsp-dev-flow.png b/poky/documentation/mega-manual/figures/bsp-dev-flow.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/bsp-dev-flow.png
rename to poky/documentation/mega-manual/figures/bsp-dev-flow.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/bsp-title.png b/poky/documentation/mega-manual/figures/bsp-title.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/bsp-title.png
rename to poky/documentation/mega-manual/figures/bsp-title.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/build-workspace-directory.png b/poky/documentation/mega-manual/figures/build-workspace-directory.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/build-workspace-directory.png
rename to poky/documentation/mega-manual/figures/build-workspace-directory.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/buildhistory-web.png b/poky/documentation/mega-manual/figures/buildhistory-web.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/buildhistory-web.png
rename to poky/documentation/mega-manual/figures/buildhistory-web.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/buildhistory.png b/poky/documentation/mega-manual/figures/buildhistory.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/buildhistory.png
rename to poky/documentation/mega-manual/figures/buildhistory.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/building-an-image.png b/poky/documentation/mega-manual/figures/building-an-image.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/building-an-image.png
rename to poky/documentation/mega-manual/figures/building-an-image.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/bypqs-title.png b/poky/documentation/mega-manual/figures/bypqs-title.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/bypqs-title.png
rename to poky/documentation/mega-manual/figures/bypqs-title.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/compatible-layers.png b/poky/documentation/mega-manual/figures/compatible-layers.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/compatible-layers.png
rename to poky/documentation/mega-manual/figures/compatible-layers.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/concepts-manual-title.png b/poky/documentation/mega-manual/figures/concepts-manual-title.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/concepts-manual-title.png
rename to poky/documentation/mega-manual/figures/concepts-manual-title.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/configuration-compile-autoreconf.png b/poky/documentation/mega-manual/figures/configuration-compile-autoreconf.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/configuration-compile-autoreconf.png
rename to poky/documentation/mega-manual/figures/configuration-compile-autoreconf.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/cross-development-toolchains.png b/poky/documentation/mega-manual/figures/cross-development-toolchains.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/cross-development-toolchains.png
rename to poky/documentation/mega-manual/figures/cross-development-toolchains.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/define-generic.png b/poky/documentation/mega-manual/figures/define-generic.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/define-generic.png
rename to poky/documentation/mega-manual/figures/define-generic.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/dev-title.png b/poky/documentation/mega-manual/figures/dev-title.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/dev-title.png
rename to poky/documentation/mega-manual/figures/dev-title.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/git-workflow.png b/poky/documentation/mega-manual/figures/git-workflow.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/git-workflow.png
rename to poky/documentation/mega-manual/figures/git-workflow.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/hosted-service.png b/poky/documentation/mega-manual/figures/hosted-service.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/hosted-service.png
rename to poky/documentation/mega-manual/figures/hosted-service.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/image-generation.png b/poky/documentation/mega-manual/figures/image-generation.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/image-generation.png
rename to poky/documentation/mega-manual/figures/image-generation.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/images.png b/poky/documentation/mega-manual/figures/images.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/images.png
rename to poky/documentation/mega-manual/figures/images.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/import-layer.png b/poky/documentation/mega-manual/figures/import-layer.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/import-layer.png
rename to poky/documentation/mega-manual/figures/import-layer.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/index-downloads.png b/poky/documentation/mega-manual/figures/index-downloads.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/index-downloads.png
rename to poky/documentation/mega-manual/figures/index-downloads.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/kernel-architecture-overview.png b/poky/documentation/mega-manual/figures/kernel-architecture-overview.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/kernel-architecture-overview.png
rename to poky/documentation/mega-manual/figures/kernel-architecture-overview.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/kernel-dev-flow.png b/poky/documentation/mega-manual/figures/kernel-dev-flow.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/kernel-dev-flow.png
rename to poky/documentation/mega-manual/figures/kernel-dev-flow.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/kernel-dev-title.png b/poky/documentation/mega-manual/figures/kernel-dev-title.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/kernel-dev-title.png
rename to poky/documentation/mega-manual/figures/kernel-dev-title.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/kernel-overview-1.png b/poky/documentation/mega-manual/figures/kernel-overview-1.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/kernel-overview-1.png
rename to poky/documentation/mega-manual/figures/kernel-overview-1.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/kernel-overview-2-generic.png b/poky/documentation/mega-manual/figures/kernel-overview-2-generic.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/kernel-overview-2-generic.png
rename to poky/documentation/mega-manual/figures/kernel-overview-2-generic.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/kernel-title.png b/poky/documentation/mega-manual/figures/kernel-title.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/kernel-title.png
rename to poky/documentation/mega-manual/figures/kernel-title.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/kernelshark-all.png b/poky/documentation/mega-manual/figures/kernelshark-all.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/kernelshark-all.png
rename to poky/documentation/mega-manual/figures/kernelshark-all.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/kernelshark-choose-events.png b/poky/documentation/mega-manual/figures/kernelshark-choose-events.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/kernelshark-choose-events.png
rename to poky/documentation/mega-manual/figures/kernelshark-choose-events.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/kernelshark-i915-display.png b/poky/documentation/mega-manual/figures/kernelshark-i915-display.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/kernelshark-i915-display.png
rename to poky/documentation/mega-manual/figures/kernelshark-i915-display.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/kernelshark-output-display.png b/poky/documentation/mega-manual/figures/kernelshark-output-display.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/kernelshark-output-display.png
rename to poky/documentation/mega-manual/figures/kernelshark-output-display.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/key-dev-elements.png b/poky/documentation/mega-manual/figures/key-dev-elements.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/key-dev-elements.png
rename to poky/documentation/mega-manual/figures/key-dev-elements.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/layer-input.png b/poky/documentation/mega-manual/figures/layer-input.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/layer-input.png
rename to poky/documentation/mega-manual/figures/layer-input.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/lttngmain0.png b/poky/documentation/mega-manual/figures/lttngmain0.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/lttngmain0.png
rename to poky/documentation/mega-manual/figures/lttngmain0.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/mega-title.png b/poky/documentation/mega-manual/figures/mega-title.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/mega-title.png
rename to poky/documentation/mega-manual/figures/mega-title.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/new-project.png b/poky/documentation/mega-manual/figures/new-project.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/new-project.png
rename to poky/documentation/mega-manual/figures/new-project.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/oprofileui-busybox.png b/poky/documentation/mega-manual/figures/oprofileui-busybox.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/oprofileui-busybox.png
rename to poky/documentation/mega-manual/figures/oprofileui-busybox.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/oprofileui-copy-to-user.png b/poky/documentation/mega-manual/figures/oprofileui-copy-to-user.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/oprofileui-copy-to-user.png
rename to poky/documentation/mega-manual/figures/oprofileui-copy-to-user.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/oprofileui-downloading.png b/poky/documentation/mega-manual/figures/oprofileui-downloading.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/oprofileui-downloading.png
rename to poky/documentation/mega-manual/figures/oprofileui-downloading.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/oprofileui-processes.png b/poky/documentation/mega-manual/figures/oprofileui-processes.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/oprofileui-processes.png
rename to poky/documentation/mega-manual/figures/oprofileui-processes.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/overview-manual-title.png b/poky/documentation/mega-manual/figures/overview-manual-title.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/overview-manual-title.png
rename to poky/documentation/mega-manual/figures/overview-manual-title.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/package-feeds.png b/poky/documentation/mega-manual/figures/package-feeds.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/package-feeds.png
rename to poky/documentation/mega-manual/figures/package-feeds.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/patching.png b/poky/documentation/mega-manual/figures/patching.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/patching.png
rename to poky/documentation/mega-manual/figures/patching.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/perf-probe-do_fork-profile.png b/poky/documentation/mega-manual/figures/perf-probe-do_fork-profile.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/perf-probe-do_fork-profile.png
rename to poky/documentation/mega-manual/figures/perf-probe-do_fork-profile.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/perf-report-cycles-u.png b/poky/documentation/mega-manual/figures/perf-report-cycles-u.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/perf-report-cycles-u.png
rename to poky/documentation/mega-manual/figures/perf-report-cycles-u.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/perf-systemwide-libc.png b/poky/documentation/mega-manual/figures/perf-systemwide-libc.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/perf-systemwide-libc.png
rename to poky/documentation/mega-manual/figures/perf-systemwide-libc.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/perf-systemwide.png b/poky/documentation/mega-manual/figures/perf-systemwide.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/perf-systemwide.png
rename to poky/documentation/mega-manual/figures/perf-systemwide.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/perf-wget-busybox-annotate-menu.png b/poky/documentation/mega-manual/figures/perf-wget-busybox-annotate-menu.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/perf-wget-busybox-annotate-menu.png
rename to poky/documentation/mega-manual/figures/perf-wget-busybox-annotate-menu.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/perf-wget-busybox-annotate-udhcpc.png b/poky/documentation/mega-manual/figures/perf-wget-busybox-annotate-udhcpc.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/perf-wget-busybox-annotate-udhcpc.png
rename to poky/documentation/mega-manual/figures/perf-wget-busybox-annotate-udhcpc.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/perf-wget-busybox-debuginfo.png b/poky/documentation/mega-manual/figures/perf-wget-busybox-debuginfo.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/perf-wget-busybox-debuginfo.png
rename to poky/documentation/mega-manual/figures/perf-wget-busybox-debuginfo.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/perf-wget-busybox-dso-zoom-menu.png b/poky/documentation/mega-manual/figures/perf-wget-busybox-dso-zoom-menu.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/perf-wget-busybox-dso-zoom-menu.png
rename to poky/documentation/mega-manual/figures/perf-wget-busybox-dso-zoom-menu.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/perf-wget-busybox-dso-zoom.png b/poky/documentation/mega-manual/figures/perf-wget-busybox-dso-zoom.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/perf-wget-busybox-dso-zoom.png
rename to poky/documentation/mega-manual/figures/perf-wget-busybox-dso-zoom.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/perf-wget-busybox-expanded-stripped.png b/poky/documentation/mega-manual/figures/perf-wget-busybox-expanded-stripped.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/perf-wget-busybox-expanded-stripped.png
rename to poky/documentation/mega-manual/figures/perf-wget-busybox-expanded-stripped.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/perf-wget-flat-stripped.png b/poky/documentation/mega-manual/figures/perf-wget-flat-stripped.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/perf-wget-flat-stripped.png
rename to poky/documentation/mega-manual/figures/perf-wget-flat-stripped.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/perf-wget-g-copy-from-user-expanded-stripped.png b/poky/documentation/mega-manual/figures/perf-wget-g-copy-from-user-expanded-stripped.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/perf-wget-g-copy-from-user-expanded-stripped.png
rename to poky/documentation/mega-manual/figures/perf-wget-g-copy-from-user-expanded-stripped.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/perf-wget-g-copy-to-user-expanded-debuginfo.png b/poky/documentation/mega-manual/figures/perf-wget-g-copy-to-user-expanded-debuginfo.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/perf-wget-g-copy-to-user-expanded-debuginfo.png
rename to poky/documentation/mega-manual/figures/perf-wget-g-copy-to-user-expanded-debuginfo.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/perf-wget-g-copy-to-user-expanded-stripped-unresolved-hidden.png b/poky/documentation/mega-manual/figures/perf-wget-g-copy-to-user-expanded-stripped-unresolved-hidden.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/perf-wget-g-copy-to-user-expanded-stripped-unresolved-hidden.png
rename to poky/documentation/mega-manual/figures/perf-wget-g-copy-to-user-expanded-stripped-unresolved-hidden.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/perf-wget-g-copy-to-user-expanded-stripped.png b/poky/documentation/mega-manual/figures/perf-wget-g-copy-to-user-expanded-stripped.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/perf-wget-g-copy-to-user-expanded-stripped.png
rename to poky/documentation/mega-manual/figures/perf-wget-g-copy-to-user-expanded-stripped.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/poky-reference-distribution.png b/poky/documentation/mega-manual/figures/poky-reference-distribution.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/poky-reference-distribution.png
rename to poky/documentation/mega-manual/figures/poky-reference-distribution.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/poky-title.png b/poky/documentation/mega-manual/figures/poky-title.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/poky-title.png
rename to poky/documentation/mega-manual/figures/poky-title.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/profile-title.png b/poky/documentation/mega-manual/figures/profile-title.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/profile-title.png
rename to poky/documentation/mega-manual/figures/profile-title.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/pybootchartgui-linux-yocto.png b/poky/documentation/mega-manual/figures/pybootchartgui-linux-yocto.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/pybootchartgui-linux-yocto.png
rename to poky/documentation/mega-manual/figures/pybootchartgui-linux-yocto.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/pychart-linux-yocto-rpm-nostrip.png b/poky/documentation/mega-manual/figures/pychart-linux-yocto-rpm-nostrip.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/pychart-linux-yocto-rpm-nostrip.png
rename to poky/documentation/mega-manual/figures/pychart-linux-yocto-rpm-nostrip.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/pychart-linux-yocto-rpm.png b/poky/documentation/mega-manual/figures/pychart-linux-yocto-rpm.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/pychart-linux-yocto-rpm.png
rename to poky/documentation/mega-manual/figures/pychart-linux-yocto-rpm.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/recipe-workflow.png b/poky/documentation/mega-manual/figures/recipe-workflow.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/recipe-workflow.png
rename to poky/documentation/mega-manual/figures/recipe-workflow.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/sched-wakeup-profile.png b/poky/documentation/mega-manual/figures/sched-wakeup-profile.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/sched-wakeup-profile.png
rename to poky/documentation/mega-manual/figures/sched-wakeup-profile.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/sdk-autotools-flow.png b/poky/documentation/mega-manual/figures/sdk-autotools-flow.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/sdk-autotools-flow.png
rename to poky/documentation/mega-manual/figures/sdk-autotools-flow.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/sdk-devtool-add-flow.png b/poky/documentation/mega-manual/figures/sdk-devtool-add-flow.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/sdk-devtool-add-flow.png
rename to poky/documentation/mega-manual/figures/sdk-devtool-add-flow.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/sdk-devtool-modify-flow.png b/poky/documentation/mega-manual/figures/sdk-devtool-modify-flow.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/sdk-devtool-modify-flow.png
rename to poky/documentation/mega-manual/figures/sdk-devtool-modify-flow.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/sdk-devtool-upgrade-flow.png b/poky/documentation/mega-manual/figures/sdk-devtool-upgrade-flow.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/sdk-devtool-upgrade-flow.png
rename to poky/documentation/mega-manual/figures/sdk-devtool-upgrade-flow.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/sdk-eclipse-dev-flow.png b/poky/documentation/mega-manual/figures/sdk-eclipse-dev-flow.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/sdk-eclipse-dev-flow.png
rename to poky/documentation/mega-manual/figures/sdk-eclipse-dev-flow.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/sdk-environment.png b/poky/documentation/mega-manual/figures/sdk-environment.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/sdk-environment.png
rename to poky/documentation/mega-manual/figures/sdk-environment.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/sdk-generation.png b/poky/documentation/mega-manual/figures/sdk-generation.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/sdk-generation.png
rename to poky/documentation/mega-manual/figures/sdk-generation.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/sdk-installed-extensible-sdk-directory.png b/poky/documentation/mega-manual/figures/sdk-installed-extensible-sdk-directory.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/sdk-installed-extensible-sdk-directory.png
rename to poky/documentation/mega-manual/figures/sdk-installed-extensible-sdk-directory.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/sdk-installed-standard-sdk-directory.png b/poky/documentation/mega-manual/figures/sdk-installed-standard-sdk-directory.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/sdk-installed-standard-sdk-directory.png
rename to poky/documentation/mega-manual/figures/sdk-installed-standard-sdk-directory.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/sdk-makefile-flow.png b/poky/documentation/mega-manual/figures/sdk-makefile-flow.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/sdk-makefile-flow.png
rename to poky/documentation/mega-manual/figures/sdk-makefile-flow.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/sdk-title.png b/poky/documentation/mega-manual/figures/sdk-title.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/sdk-title.png
rename to poky/documentation/mega-manual/figures/sdk-title.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/sdk.png b/poky/documentation/mega-manual/figures/sdk.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/sdk.png
rename to poky/documentation/mega-manual/figures/sdk.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/set-variable.png b/poky/documentation/mega-manual/figures/set-variable.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/set-variable.png
rename to poky/documentation/mega-manual/figures/set-variable.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/simple-configuration.png b/poky/documentation/mega-manual/figures/simple-configuration.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/simple-configuration.png
rename to poky/documentation/mega-manual/figures/simple-configuration.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/source-fetching.png b/poky/documentation/mega-manual/figures/source-fetching.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/source-fetching.png
rename to poky/documentation/mega-manual/figures/source-fetching.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/source-input.png b/poky/documentation/mega-manual/figures/source-input.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/source-input.png
rename to poky/documentation/mega-manual/figures/source-input.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/source-repos.png b/poky/documentation/mega-manual/figures/source-repos.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/source-repos.png
rename to poky/documentation/mega-manual/figures/source-repos.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/sysprof-callers.png b/poky/documentation/mega-manual/figures/sysprof-callers.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/sysprof-callers.png
rename to poky/documentation/mega-manual/figures/sysprof-callers.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/sysprof-copy-from-user.png b/poky/documentation/mega-manual/figures/sysprof-copy-from-user.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/sysprof-copy-from-user.png
rename to poky/documentation/mega-manual/figures/sysprof-copy-from-user.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/sysprof-copy-to-user.png b/poky/documentation/mega-manual/figures/sysprof-copy-to-user.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/sysprof-copy-to-user.png
rename to poky/documentation/mega-manual/figures/sysprof-copy-to-user.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/toaster-title.png b/poky/documentation/mega-manual/figures/toaster-title.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/toaster-title.png
rename to poky/documentation/mega-manual/figures/toaster-title.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/user-configuration.png b/poky/documentation/mega-manual/figures/user-configuration.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/user-configuration.png
rename to poky/documentation/mega-manual/figures/user-configuration.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/using-a-pre-built-image.png b/poky/documentation/mega-manual/figures/using-a-pre-built-image.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/using-a-pre-built-image.png
rename to poky/documentation/mega-manual/figures/using-a-pre-built-image.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/variable-added.png b/poky/documentation/mega-manual/figures/variable-added.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/variable-added.png
rename to poky/documentation/mega-manual/figures/variable-added.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/yocto-project-transp.png b/poky/documentation/mega-manual/figures/yocto-project-transp.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/yocto-project-transp.png
rename to poky/documentation/mega-manual/figures/yocto-project-transp.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/figures/yp-download.png b/poky/documentation/mega-manual/figures/yp-download.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/figures/yp-download.png
rename to poky/documentation/mega-manual/figures/yp-download.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/mega-manual/mega-manual-customization.xsl b/poky/documentation/mega-manual/mega-manual-customization.xsl
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/mega-manual-customization.xsl
rename to poky/documentation/mega-manual/mega-manual-customization.xsl
diff --git a/import-layers/yocto-poky/documentation/mega-manual/mega-manual.xml b/poky/documentation/mega-manual/mega-manual.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/mega-manual.xml
rename to poky/documentation/mega-manual/mega-manual.xml
diff --git a/import-layers/yocto-poky/documentation/mega-manual/mega-style.css b/poky/documentation/mega-manual/mega-style.css
similarity index 100%
rename from import-layers/yocto-poky/documentation/mega-manual/mega-style.css
rename to poky/documentation/mega-manual/mega-style.css
diff --git a/import-layers/yocto-poky/documentation/overview-manual/figures/YP-flow-diagram.png b/poky/documentation/overview-manual/figures/YP-flow-diagram.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/overview-manual/figures/YP-flow-diagram.png
rename to poky/documentation/overview-manual/figures/YP-flow-diagram.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/overview-manual/figures/analysis-for-package-splitting.png b/poky/documentation/overview-manual/figures/analysis-for-package-splitting.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/overview-manual/figures/analysis-for-package-splitting.png
rename to poky/documentation/overview-manual/figures/analysis-for-package-splitting.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/overview-manual/figures/configuration-compile-autoreconf.png b/poky/documentation/overview-manual/figures/configuration-compile-autoreconf.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/overview-manual/figures/configuration-compile-autoreconf.png
rename to poky/documentation/overview-manual/figures/configuration-compile-autoreconf.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/overview-manual/figures/cross-development-toolchains.png b/poky/documentation/overview-manual/figures/cross-development-toolchains.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/overview-manual/figures/cross-development-toolchains.png
rename to poky/documentation/overview-manual/figures/cross-development-toolchains.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/overview-manual/figures/git-workflow.png b/poky/documentation/overview-manual/figures/git-workflow.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/overview-manual/figures/git-workflow.png
rename to poky/documentation/overview-manual/figures/git-workflow.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/overview-manual/figures/image-generation.png b/poky/documentation/overview-manual/figures/image-generation.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/overview-manual/figures/image-generation.png
rename to poky/documentation/overview-manual/figures/image-generation.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/overview-manual/figures/images.png b/poky/documentation/overview-manual/figures/images.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/overview-manual/figures/images.png
rename to poky/documentation/overview-manual/figures/images.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/overview-manual/figures/index-downloads.png b/poky/documentation/overview-manual/figures/index-downloads.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/overview-manual/figures/index-downloads.png
rename to poky/documentation/overview-manual/figures/index-downloads.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/overview-manual/figures/key-dev-elements.png b/poky/documentation/overview-manual/figures/key-dev-elements.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/overview-manual/figures/key-dev-elements.png
rename to poky/documentation/overview-manual/figures/key-dev-elements.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/overview-manual/figures/layer-input.png b/poky/documentation/overview-manual/figures/layer-input.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/overview-manual/figures/layer-input.png
rename to poky/documentation/overview-manual/figures/layer-input.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/overview-manual/figures/overview-manual-title.png b/poky/documentation/overview-manual/figures/overview-manual-title.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/overview-manual/figures/overview-manual-title.png
rename to poky/documentation/overview-manual/figures/overview-manual-title.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/overview-manual/figures/package-feeds.png b/poky/documentation/overview-manual/figures/package-feeds.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/overview-manual/figures/package-feeds.png
rename to poky/documentation/overview-manual/figures/package-feeds.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/overview-manual/figures/patching.png b/poky/documentation/overview-manual/figures/patching.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/overview-manual/figures/patching.png
rename to poky/documentation/overview-manual/figures/patching.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/overview-manual/figures/poky-reference-distribution.png b/poky/documentation/overview-manual/figures/poky-reference-distribution.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/overview-manual/figures/poky-reference-distribution.png
rename to poky/documentation/overview-manual/figures/poky-reference-distribution.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/overview-manual/figures/sdk-generation.png b/poky/documentation/overview-manual/figures/sdk-generation.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/overview-manual/figures/sdk-generation.png
rename to poky/documentation/overview-manual/figures/sdk-generation.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/overview-manual/figures/sdk.png b/poky/documentation/overview-manual/figures/sdk.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/overview-manual/figures/sdk.png
rename to poky/documentation/overview-manual/figures/sdk.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/overview-manual/figures/source-fetching.png b/poky/documentation/overview-manual/figures/source-fetching.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/overview-manual/figures/source-fetching.png
rename to poky/documentation/overview-manual/figures/source-fetching.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/overview-manual/figures/source-input.png b/poky/documentation/overview-manual/figures/source-input.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/overview-manual/figures/source-input.png
rename to poky/documentation/overview-manual/figures/source-input.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/overview-manual/figures/source-repos.png b/poky/documentation/overview-manual/figures/source-repos.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/overview-manual/figures/source-repos.png
rename to poky/documentation/overview-manual/figures/source-repos.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/overview-manual/figures/user-configuration.png b/poky/documentation/overview-manual/figures/user-configuration.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/overview-manual/figures/user-configuration.png
rename to poky/documentation/overview-manual/figures/user-configuration.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/overview-manual/figures/yp-download.png b/poky/documentation/overview-manual/figures/yp-download.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/overview-manual/figures/yp-download.png
rename to poky/documentation/overview-manual/figures/yp-download.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/overview-manual/overview-manual-concepts.xml b/poky/documentation/overview-manual/overview-manual-concepts.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/overview-manual/overview-manual-concepts.xml
rename to poky/documentation/overview-manual/overview-manual-concepts.xml
diff --git a/import-layers/yocto-poky/documentation/overview-manual/overview-manual-customization.xsl b/poky/documentation/overview-manual/overview-manual-customization.xsl
similarity index 100%
rename from import-layers/yocto-poky/documentation/overview-manual/overview-manual-customization.xsl
rename to poky/documentation/overview-manual/overview-manual-customization.xsl
diff --git a/import-layers/yocto-poky/documentation/overview-manual/overview-manual-development-environment.xml b/poky/documentation/overview-manual/overview-manual-development-environment.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/overview-manual/overview-manual-development-environment.xml
rename to poky/documentation/overview-manual/overview-manual-development-environment.xml
diff --git a/import-layers/yocto-poky/documentation/overview-manual/overview-manual-eclipse-customization.xsl b/poky/documentation/overview-manual/overview-manual-eclipse-customization.xsl
similarity index 100%
rename from import-layers/yocto-poky/documentation/overview-manual/overview-manual-eclipse-customization.xsl
rename to poky/documentation/overview-manual/overview-manual-eclipse-customization.xsl
diff --git a/import-layers/yocto-poky/documentation/overview-manual/overview-manual-intro.xml b/poky/documentation/overview-manual/overview-manual-intro.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/overview-manual/overview-manual-intro.xml
rename to poky/documentation/overview-manual/overview-manual-intro.xml
diff --git a/import-layers/yocto-poky/documentation/overview-manual/overview-manual-style.css b/poky/documentation/overview-manual/overview-manual-style.css
similarity index 100%
rename from import-layers/yocto-poky/documentation/overview-manual/overview-manual-style.css
rename to poky/documentation/overview-manual/overview-manual-style.css
diff --git a/import-layers/yocto-poky/documentation/overview-manual/overview-manual-yp-intro.xml b/poky/documentation/overview-manual/overview-manual-yp-intro.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/overview-manual/overview-manual-yp-intro.xml
rename to poky/documentation/overview-manual/overview-manual-yp-intro.xml
diff --git a/import-layers/yocto-poky/documentation/overview-manual/overview-manual.xml b/poky/documentation/overview-manual/overview-manual.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/overview-manual/overview-manual.xml
rename to poky/documentation/overview-manual/overview-manual.xml
diff --git a/import-layers/yocto-poky/documentation/poky.ent b/poky/documentation/poky.ent
similarity index 100%
rename from import-layers/yocto-poky/documentation/poky.ent
rename to poky/documentation/poky.ent
diff --git a/import-layers/yocto-poky/documentation/profile-manual/figures/kernelshark-all.png b/poky/documentation/profile-manual/figures/kernelshark-all.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/profile-manual/figures/kernelshark-all.png
rename to poky/documentation/profile-manual/figures/kernelshark-all.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/profile-manual/figures/kernelshark-choose-events.png b/poky/documentation/profile-manual/figures/kernelshark-choose-events.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/profile-manual/figures/kernelshark-choose-events.png
rename to poky/documentation/profile-manual/figures/kernelshark-choose-events.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/profile-manual/figures/kernelshark-i915-display.png b/poky/documentation/profile-manual/figures/kernelshark-i915-display.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/profile-manual/figures/kernelshark-i915-display.png
rename to poky/documentation/profile-manual/figures/kernelshark-i915-display.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/profile-manual/figures/kernelshark-output-display.png b/poky/documentation/profile-manual/figures/kernelshark-output-display.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/profile-manual/figures/kernelshark-output-display.png
rename to poky/documentation/profile-manual/figures/kernelshark-output-display.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/profile-manual/figures/lttngmain0.png b/poky/documentation/profile-manual/figures/lttngmain0.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/profile-manual/figures/lttngmain0.png
rename to poky/documentation/profile-manual/figures/lttngmain0.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/profile-manual/figures/oprofileui-busybox.png b/poky/documentation/profile-manual/figures/oprofileui-busybox.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/profile-manual/figures/oprofileui-busybox.png
rename to poky/documentation/profile-manual/figures/oprofileui-busybox.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/profile-manual/figures/oprofileui-copy-to-user.png b/poky/documentation/profile-manual/figures/oprofileui-copy-to-user.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/profile-manual/figures/oprofileui-copy-to-user.png
rename to poky/documentation/profile-manual/figures/oprofileui-copy-to-user.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/profile-manual/figures/oprofileui-downloading.png b/poky/documentation/profile-manual/figures/oprofileui-downloading.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/profile-manual/figures/oprofileui-downloading.png
rename to poky/documentation/profile-manual/figures/oprofileui-downloading.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/profile-manual/figures/oprofileui-processes.png b/poky/documentation/profile-manual/figures/oprofileui-processes.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/profile-manual/figures/oprofileui-processes.png
rename to poky/documentation/profile-manual/figures/oprofileui-processes.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/profile-manual/figures/perf-probe-do_fork-profile.png b/poky/documentation/profile-manual/figures/perf-probe-do_fork-profile.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/profile-manual/figures/perf-probe-do_fork-profile.png
rename to poky/documentation/profile-manual/figures/perf-probe-do_fork-profile.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/profile-manual/figures/perf-report-cycles-u.png b/poky/documentation/profile-manual/figures/perf-report-cycles-u.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/profile-manual/figures/perf-report-cycles-u.png
rename to poky/documentation/profile-manual/figures/perf-report-cycles-u.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/profile-manual/figures/perf-systemwide-libc.png b/poky/documentation/profile-manual/figures/perf-systemwide-libc.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/profile-manual/figures/perf-systemwide-libc.png
rename to poky/documentation/profile-manual/figures/perf-systemwide-libc.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/profile-manual/figures/perf-systemwide.png b/poky/documentation/profile-manual/figures/perf-systemwide.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/profile-manual/figures/perf-systemwide.png
rename to poky/documentation/profile-manual/figures/perf-systemwide.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/profile-manual/figures/perf-wget-busybox-annotate-menu.png b/poky/documentation/profile-manual/figures/perf-wget-busybox-annotate-menu.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/profile-manual/figures/perf-wget-busybox-annotate-menu.png
rename to poky/documentation/profile-manual/figures/perf-wget-busybox-annotate-menu.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/profile-manual/figures/perf-wget-busybox-annotate-udhcpc.png b/poky/documentation/profile-manual/figures/perf-wget-busybox-annotate-udhcpc.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/profile-manual/figures/perf-wget-busybox-annotate-udhcpc.png
rename to poky/documentation/profile-manual/figures/perf-wget-busybox-annotate-udhcpc.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/profile-manual/figures/perf-wget-busybox-debuginfo.png b/poky/documentation/profile-manual/figures/perf-wget-busybox-debuginfo.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/profile-manual/figures/perf-wget-busybox-debuginfo.png
rename to poky/documentation/profile-manual/figures/perf-wget-busybox-debuginfo.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/profile-manual/figures/perf-wget-busybox-dso-zoom-menu.png b/poky/documentation/profile-manual/figures/perf-wget-busybox-dso-zoom-menu.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/profile-manual/figures/perf-wget-busybox-dso-zoom-menu.png
rename to poky/documentation/profile-manual/figures/perf-wget-busybox-dso-zoom-menu.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/profile-manual/figures/perf-wget-busybox-dso-zoom.png b/poky/documentation/profile-manual/figures/perf-wget-busybox-dso-zoom.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/profile-manual/figures/perf-wget-busybox-dso-zoom.png
rename to poky/documentation/profile-manual/figures/perf-wget-busybox-dso-zoom.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/profile-manual/figures/perf-wget-busybox-expanded-stripped.png b/poky/documentation/profile-manual/figures/perf-wget-busybox-expanded-stripped.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/profile-manual/figures/perf-wget-busybox-expanded-stripped.png
rename to poky/documentation/profile-manual/figures/perf-wget-busybox-expanded-stripped.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/profile-manual/figures/perf-wget-flat-stripped.png b/poky/documentation/profile-manual/figures/perf-wget-flat-stripped.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/profile-manual/figures/perf-wget-flat-stripped.png
rename to poky/documentation/profile-manual/figures/perf-wget-flat-stripped.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/profile-manual/figures/perf-wget-g-copy-from-user-expanded-stripped.png b/poky/documentation/profile-manual/figures/perf-wget-g-copy-from-user-expanded-stripped.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/profile-manual/figures/perf-wget-g-copy-from-user-expanded-stripped.png
rename to poky/documentation/profile-manual/figures/perf-wget-g-copy-from-user-expanded-stripped.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/profile-manual/figures/perf-wget-g-copy-to-user-expanded-debuginfo.png b/poky/documentation/profile-manual/figures/perf-wget-g-copy-to-user-expanded-debuginfo.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/profile-manual/figures/perf-wget-g-copy-to-user-expanded-debuginfo.png
rename to poky/documentation/profile-manual/figures/perf-wget-g-copy-to-user-expanded-debuginfo.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/profile-manual/figures/perf-wget-g-copy-to-user-expanded-stripped-unresolved-hidden.png b/poky/documentation/profile-manual/figures/perf-wget-g-copy-to-user-expanded-stripped-unresolved-hidden.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/profile-manual/figures/perf-wget-g-copy-to-user-expanded-stripped-unresolved-hidden.png
rename to poky/documentation/profile-manual/figures/perf-wget-g-copy-to-user-expanded-stripped-unresolved-hidden.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/profile-manual/figures/perf-wget-g-copy-to-user-expanded-stripped.png b/poky/documentation/profile-manual/figures/perf-wget-g-copy-to-user-expanded-stripped.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/profile-manual/figures/perf-wget-g-copy-to-user-expanded-stripped.png
rename to poky/documentation/profile-manual/figures/perf-wget-g-copy-to-user-expanded-stripped.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/profile-manual/figures/profile-title.png b/poky/documentation/profile-manual/figures/profile-title.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/profile-manual/figures/profile-title.png
rename to poky/documentation/profile-manual/figures/profile-title.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/profile-manual/figures/pybootchartgui-linux-yocto.png b/poky/documentation/profile-manual/figures/pybootchartgui-linux-yocto.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/profile-manual/figures/pybootchartgui-linux-yocto.png
rename to poky/documentation/profile-manual/figures/pybootchartgui-linux-yocto.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/profile-manual/figures/pychart-linux-yocto-rpm-nostrip.png b/poky/documentation/profile-manual/figures/pychart-linux-yocto-rpm-nostrip.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/profile-manual/figures/pychart-linux-yocto-rpm-nostrip.png
rename to poky/documentation/profile-manual/figures/pychart-linux-yocto-rpm-nostrip.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/profile-manual/figures/pychart-linux-yocto-rpm.png b/poky/documentation/profile-manual/figures/pychart-linux-yocto-rpm.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/profile-manual/figures/pychart-linux-yocto-rpm.png
rename to poky/documentation/profile-manual/figures/pychart-linux-yocto-rpm.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/profile-manual/figures/sched-wakeup-profile.png b/poky/documentation/profile-manual/figures/sched-wakeup-profile.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/profile-manual/figures/sched-wakeup-profile.png
rename to poky/documentation/profile-manual/figures/sched-wakeup-profile.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/profile-manual/figures/sysprof-callers.png b/poky/documentation/profile-manual/figures/sysprof-callers.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/profile-manual/figures/sysprof-callers.png
rename to poky/documentation/profile-manual/figures/sysprof-callers.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/profile-manual/figures/sysprof-copy-from-user.png b/poky/documentation/profile-manual/figures/sysprof-copy-from-user.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/profile-manual/figures/sysprof-copy-from-user.png
rename to poky/documentation/profile-manual/figures/sysprof-copy-from-user.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/profile-manual/figures/sysprof-copy-to-user.png b/poky/documentation/profile-manual/figures/sysprof-copy-to-user.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/profile-manual/figures/sysprof-copy-to-user.png
rename to poky/documentation/profile-manual/figures/sysprof-copy-to-user.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/profile-manual/profile-manual-arch.xml b/poky/documentation/profile-manual/profile-manual-arch.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/profile-manual/profile-manual-arch.xml
rename to poky/documentation/profile-manual/profile-manual-arch.xml
diff --git a/import-layers/yocto-poky/documentation/profile-manual/profile-manual-customization.xsl b/poky/documentation/profile-manual/profile-manual-customization.xsl
similarity index 100%
rename from import-layers/yocto-poky/documentation/profile-manual/profile-manual-customization.xsl
rename to poky/documentation/profile-manual/profile-manual-customization.xsl
diff --git a/import-layers/yocto-poky/documentation/profile-manual/profile-manual-eclipse-customization.xsl b/poky/documentation/profile-manual/profile-manual-eclipse-customization.xsl
similarity index 100%
rename from import-layers/yocto-poky/documentation/profile-manual/profile-manual-eclipse-customization.xsl
rename to poky/documentation/profile-manual/profile-manual-eclipse-customization.xsl
diff --git a/import-layers/yocto-poky/documentation/profile-manual/profile-manual-examples.xml b/poky/documentation/profile-manual/profile-manual-examples.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/profile-manual/profile-manual-examples.xml
rename to poky/documentation/profile-manual/profile-manual-examples.xml
diff --git a/import-layers/yocto-poky/documentation/profile-manual/profile-manual-intro.xml b/poky/documentation/profile-manual/profile-manual-intro.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/profile-manual/profile-manual-intro.xml
rename to poky/documentation/profile-manual/profile-manual-intro.xml
diff --git a/import-layers/yocto-poky/documentation/profile-manual/profile-manual-style.css b/poky/documentation/profile-manual/profile-manual-style.css
similarity index 100%
rename from import-layers/yocto-poky/documentation/profile-manual/profile-manual-style.css
rename to poky/documentation/profile-manual/profile-manual-style.css
diff --git a/import-layers/yocto-poky/documentation/profile-manual/profile-manual-usage.xml b/poky/documentation/profile-manual/profile-manual-usage.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/profile-manual/profile-manual-usage.xml
rename to poky/documentation/profile-manual/profile-manual-usage.xml
diff --git a/import-layers/yocto-poky/documentation/profile-manual/profile-manual.xml b/poky/documentation/profile-manual/profile-manual.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/profile-manual/profile-manual.xml
rename to poky/documentation/profile-manual/profile-manual.xml
diff --git a/import-layers/yocto-poky/documentation/ref-manual/TODO b/poky/documentation/ref-manual/TODO
similarity index 100%
rename from import-layers/yocto-poky/documentation/ref-manual/TODO
rename to poky/documentation/ref-manual/TODO
diff --git a/import-layers/yocto-poky/documentation/ref-manual/examples/hello-autotools/hello_2.3.bb b/poky/documentation/ref-manual/examples/hello-autotools/hello_2.3.bb
similarity index 100%
rename from import-layers/yocto-poky/documentation/ref-manual/examples/hello-autotools/hello_2.3.bb
rename to poky/documentation/ref-manual/examples/hello-autotools/hello_2.3.bb
diff --git a/import-layers/yocto-poky/documentation/ref-manual/examples/hello-single/files/helloworld.c b/poky/documentation/ref-manual/examples/hello-single/files/helloworld.c
similarity index 100%
rename from import-layers/yocto-poky/documentation/ref-manual/examples/hello-single/files/helloworld.c
rename to poky/documentation/ref-manual/examples/hello-single/files/helloworld.c
diff --git a/import-layers/yocto-poky/documentation/ref-manual/examples/hello-single/hello.bb b/poky/documentation/ref-manual/examples/hello-single/hello.bb
similarity index 100%
rename from import-layers/yocto-poky/documentation/ref-manual/examples/hello-single/hello.bb
rename to poky/documentation/ref-manual/examples/hello-single/hello.bb
diff --git a/import-layers/yocto-poky/documentation/ref-manual/examples/libxpm/libxpm_3.5.6.bb b/poky/documentation/ref-manual/examples/libxpm/libxpm_3.5.6.bb
similarity index 100%
rename from import-layers/yocto-poky/documentation/ref-manual/examples/libxpm/libxpm_3.5.6.bb
rename to poky/documentation/ref-manual/examples/libxpm/libxpm_3.5.6.bb
diff --git a/import-layers/yocto-poky/documentation/ref-manual/examples/mtd-makefile/mtd-utils_1.0.0.bb b/poky/documentation/ref-manual/examples/mtd-makefile/mtd-utils_1.0.0.bb
similarity index 100%
rename from import-layers/yocto-poky/documentation/ref-manual/examples/mtd-makefile/mtd-utils_1.0.0.bb
rename to poky/documentation/ref-manual/examples/mtd-makefile/mtd-utils_1.0.0.bb
diff --git a/import-layers/yocto-poky/documentation/ref-manual/faq.xml b/poky/documentation/ref-manual/faq.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/ref-manual/faq.xml
rename to poky/documentation/ref-manual/faq.xml
diff --git a/import-layers/yocto-poky/documentation/ref-manual/figures/build-workspace-directory.png b/poky/documentation/ref-manual/figures/build-workspace-directory.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/ref-manual/figures/build-workspace-directory.png
rename to poky/documentation/ref-manual/figures/build-workspace-directory.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/ref-manual/figures/define-generic.png b/poky/documentation/ref-manual/figures/define-generic.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/ref-manual/figures/define-generic.png
rename to poky/documentation/ref-manual/figures/define-generic.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/ref-manual/figures/poky-title.png b/poky/documentation/ref-manual/figures/poky-title.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/ref-manual/figures/poky-title.png
rename to poky/documentation/ref-manual/figures/poky-title.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/ref-manual/migration.xml b/poky/documentation/ref-manual/migration.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/ref-manual/migration.xml
rename to poky/documentation/ref-manual/migration.xml
diff --git a/import-layers/yocto-poky/documentation/ref-manual/ref-classes.xml b/poky/documentation/ref-manual/ref-classes.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/ref-manual/ref-classes.xml
rename to poky/documentation/ref-manual/ref-classes.xml
diff --git a/import-layers/yocto-poky/documentation/ref-manual/ref-devtool-reference.xml b/poky/documentation/ref-manual/ref-devtool-reference.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/ref-manual/ref-devtool-reference.xml
rename to poky/documentation/ref-manual/ref-devtool-reference.xml
diff --git a/import-layers/yocto-poky/documentation/ref-manual/ref-features.xml b/poky/documentation/ref-manual/ref-features.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/ref-manual/ref-features.xml
rename to poky/documentation/ref-manual/ref-features.xml
diff --git a/import-layers/yocto-poky/documentation/ref-manual/ref-images.xml b/poky/documentation/ref-manual/ref-images.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/ref-manual/ref-images.xml
rename to poky/documentation/ref-manual/ref-images.xml
diff --git a/import-layers/yocto-poky/documentation/ref-manual/ref-kickstart.xml b/poky/documentation/ref-manual/ref-kickstart.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/ref-manual/ref-kickstart.xml
rename to poky/documentation/ref-manual/ref-kickstart.xml
diff --git a/import-layers/yocto-poky/documentation/ref-manual/ref-manual-customization.xsl b/poky/documentation/ref-manual/ref-manual-customization.xsl
similarity index 100%
rename from import-layers/yocto-poky/documentation/ref-manual/ref-manual-customization.xsl
rename to poky/documentation/ref-manual/ref-manual-customization.xsl
diff --git a/import-layers/yocto-poky/documentation/ref-manual/ref-manual-eclipse-customization.xsl b/poky/documentation/ref-manual/ref-manual-eclipse-customization.xsl
similarity index 100%
rename from import-layers/yocto-poky/documentation/ref-manual/ref-manual-eclipse-customization.xsl
rename to poky/documentation/ref-manual/ref-manual-eclipse-customization.xsl
diff --git a/import-layers/yocto-poky/documentation/ref-manual/ref-manual.xml b/poky/documentation/ref-manual/ref-manual.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/ref-manual/ref-manual.xml
rename to poky/documentation/ref-manual/ref-manual.xml
diff --git a/import-layers/yocto-poky/documentation/ref-manual/ref-qa-checks.xml b/poky/documentation/ref-manual/ref-qa-checks.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/ref-manual/ref-qa-checks.xml
rename to poky/documentation/ref-manual/ref-qa-checks.xml
diff --git a/import-layers/yocto-poky/documentation/ref-manual/ref-release-process.xml b/poky/documentation/ref-manual/ref-release-process.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/ref-manual/ref-release-process.xml
rename to poky/documentation/ref-manual/ref-release-process.xml
diff --git a/import-layers/yocto-poky/documentation/ref-manual/ref-structure.xml b/poky/documentation/ref-manual/ref-structure.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/ref-manual/ref-structure.xml
rename to poky/documentation/ref-manual/ref-structure.xml
diff --git a/import-layers/yocto-poky/documentation/ref-manual/ref-style.css b/poky/documentation/ref-manual/ref-style.css
similarity index 100%
rename from import-layers/yocto-poky/documentation/ref-manual/ref-style.css
rename to poky/documentation/ref-manual/ref-style.css
diff --git a/import-layers/yocto-poky/documentation/ref-manual/ref-system-requirements.xml b/poky/documentation/ref-manual/ref-system-requirements.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/ref-manual/ref-system-requirements.xml
rename to poky/documentation/ref-manual/ref-system-requirements.xml
diff --git a/import-layers/yocto-poky/documentation/ref-manual/ref-tasks.xml b/poky/documentation/ref-manual/ref-tasks.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/ref-manual/ref-tasks.xml
rename to poky/documentation/ref-manual/ref-tasks.xml
diff --git a/import-layers/yocto-poky/documentation/ref-manual/ref-terms.xml b/poky/documentation/ref-manual/ref-terms.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/ref-manual/ref-terms.xml
rename to poky/documentation/ref-manual/ref-terms.xml
diff --git a/import-layers/yocto-poky/documentation/ref-manual/ref-variables.xml b/poky/documentation/ref-manual/ref-variables.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/ref-manual/ref-variables.xml
rename to poky/documentation/ref-manual/ref-variables.xml
diff --git a/import-layers/yocto-poky/documentation/ref-manual/ref-varlocality.xml b/poky/documentation/ref-manual/ref-varlocality.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/ref-manual/ref-varlocality.xml
rename to poky/documentation/ref-manual/ref-varlocality.xml
diff --git a/import-layers/yocto-poky/documentation/ref-manual/resources.xml b/poky/documentation/ref-manual/resources.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/ref-manual/resources.xml
rename to poky/documentation/ref-manual/resources.xml
diff --git a/import-layers/yocto-poky/documentation/sdk-manual/figures/sdk-autotools-flow.png b/poky/documentation/sdk-manual/figures/sdk-autotools-flow.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/sdk-manual/figures/sdk-autotools-flow.png
rename to poky/documentation/sdk-manual/figures/sdk-autotools-flow.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/sdk-manual/figures/sdk-devtool-add-flow.png b/poky/documentation/sdk-manual/figures/sdk-devtool-add-flow.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/sdk-manual/figures/sdk-devtool-add-flow.png
rename to poky/documentation/sdk-manual/figures/sdk-devtool-add-flow.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/sdk-manual/figures/sdk-devtool-modify-flow.png b/poky/documentation/sdk-manual/figures/sdk-devtool-modify-flow.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/sdk-manual/figures/sdk-devtool-modify-flow.png
rename to poky/documentation/sdk-manual/figures/sdk-devtool-modify-flow.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/sdk-manual/figures/sdk-devtool-upgrade-flow.png b/poky/documentation/sdk-manual/figures/sdk-devtool-upgrade-flow.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/sdk-manual/figures/sdk-devtool-upgrade-flow.png
rename to poky/documentation/sdk-manual/figures/sdk-devtool-upgrade-flow.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/sdk-manual/figures/sdk-eclipse-dev-flow.png b/poky/documentation/sdk-manual/figures/sdk-eclipse-dev-flow.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/sdk-manual/figures/sdk-eclipse-dev-flow.png
rename to poky/documentation/sdk-manual/figures/sdk-eclipse-dev-flow.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/sdk-manual/figures/sdk-environment.png b/poky/documentation/sdk-manual/figures/sdk-environment.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/sdk-manual/figures/sdk-environment.png
rename to poky/documentation/sdk-manual/figures/sdk-environment.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/sdk-manual/figures/sdk-installed-extensible-sdk-directory.png b/poky/documentation/sdk-manual/figures/sdk-installed-extensible-sdk-directory.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/sdk-manual/figures/sdk-installed-extensible-sdk-directory.png
rename to poky/documentation/sdk-manual/figures/sdk-installed-extensible-sdk-directory.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/sdk-manual/figures/sdk-installed-standard-sdk-directory.png b/poky/documentation/sdk-manual/figures/sdk-installed-standard-sdk-directory.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/sdk-manual/figures/sdk-installed-standard-sdk-directory.png
rename to poky/documentation/sdk-manual/figures/sdk-installed-standard-sdk-directory.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/sdk-manual/figures/sdk-makefile-flow.png b/poky/documentation/sdk-manual/figures/sdk-makefile-flow.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/sdk-manual/figures/sdk-makefile-flow.png
rename to poky/documentation/sdk-manual/figures/sdk-makefile-flow.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/sdk-manual/figures/sdk-title.png b/poky/documentation/sdk-manual/figures/sdk-title.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/sdk-manual/figures/sdk-title.png
rename to poky/documentation/sdk-manual/figures/sdk-title.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/sdk-manual/sdk-appendix-customizing-standard.xml b/poky/documentation/sdk-manual/sdk-appendix-customizing-standard.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/sdk-manual/sdk-appendix-customizing-standard.xml
rename to poky/documentation/sdk-manual/sdk-appendix-customizing-standard.xml
diff --git a/import-layers/yocto-poky/documentation/sdk-manual/sdk-appendix-customizing.xml b/poky/documentation/sdk-manual/sdk-appendix-customizing.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/sdk-manual/sdk-appendix-customizing.xml
rename to poky/documentation/sdk-manual/sdk-appendix-customizing.xml
diff --git a/import-layers/yocto-poky/documentation/sdk-manual/sdk-appendix-neon.xml b/poky/documentation/sdk-manual/sdk-appendix-neon.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/sdk-manual/sdk-appendix-neon.xml
rename to poky/documentation/sdk-manual/sdk-appendix-neon.xml
diff --git a/import-layers/yocto-poky/documentation/sdk-manual/sdk-appendix-obtain.xml b/poky/documentation/sdk-manual/sdk-appendix-obtain.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/sdk-manual/sdk-appendix-obtain.xml
rename to poky/documentation/sdk-manual/sdk-appendix-obtain.xml
diff --git a/import-layers/yocto-poky/documentation/sdk-manual/sdk-eclipse-project.xml b/poky/documentation/sdk-manual/sdk-eclipse-project.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/sdk-manual/sdk-eclipse-project.xml
rename to poky/documentation/sdk-manual/sdk-eclipse-project.xml
diff --git a/import-layers/yocto-poky/documentation/sdk-manual/sdk-extensible.xml b/poky/documentation/sdk-manual/sdk-extensible.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/sdk-manual/sdk-extensible.xml
rename to poky/documentation/sdk-manual/sdk-extensible.xml
diff --git a/import-layers/yocto-poky/documentation/sdk-manual/sdk-intro.xml b/poky/documentation/sdk-manual/sdk-intro.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/sdk-manual/sdk-intro.xml
rename to poky/documentation/sdk-manual/sdk-intro.xml
diff --git a/import-layers/yocto-poky/documentation/sdk-manual/sdk-manual-customization.xsl b/poky/documentation/sdk-manual/sdk-manual-customization.xsl
similarity index 100%
rename from import-layers/yocto-poky/documentation/sdk-manual/sdk-manual-customization.xsl
rename to poky/documentation/sdk-manual/sdk-manual-customization.xsl
diff --git a/import-layers/yocto-poky/documentation/sdk-manual/sdk-manual-eclipse-customization.xsl b/poky/documentation/sdk-manual/sdk-manual-eclipse-customization.xsl
similarity index 100%
rename from import-layers/yocto-poky/documentation/sdk-manual/sdk-manual-eclipse-customization.xsl
rename to poky/documentation/sdk-manual/sdk-manual-eclipse-customization.xsl
diff --git a/import-layers/yocto-poky/documentation/sdk-manual/sdk-manual.xml b/poky/documentation/sdk-manual/sdk-manual.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/sdk-manual/sdk-manual.xml
rename to poky/documentation/sdk-manual/sdk-manual.xml
diff --git a/import-layers/yocto-poky/documentation/sdk-manual/sdk-style.css b/poky/documentation/sdk-manual/sdk-style.css
similarity index 100%
rename from import-layers/yocto-poky/documentation/sdk-manual/sdk-style.css
rename to poky/documentation/sdk-manual/sdk-style.css
diff --git a/import-layers/yocto-poky/documentation/sdk-manual/sdk-using.xml b/poky/documentation/sdk-manual/sdk-using.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/sdk-manual/sdk-using.xml
rename to poky/documentation/sdk-manual/sdk-using.xml
diff --git a/import-layers/yocto-poky/documentation/sdk-manual/sdk-working-projects.xml b/poky/documentation/sdk-manual/sdk-working-projects.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/sdk-manual/sdk-working-projects.xml
rename to poky/documentation/sdk-manual/sdk-working-projects.xml
diff --git a/import-layers/yocto-poky/documentation/template/Vera.ttf b/poky/documentation/template/Vera.ttf
similarity index 100%
rename from import-layers/yocto-poky/documentation/template/Vera.ttf
rename to poky/documentation/template/Vera.ttf
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/template/Vera.xml b/poky/documentation/template/Vera.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/template/Vera.xml
rename to poky/documentation/template/Vera.xml
diff --git a/import-layers/yocto-poky/documentation/template/VeraMoBd.ttf b/poky/documentation/template/VeraMoBd.ttf
similarity index 100%
rename from import-layers/yocto-poky/documentation/template/VeraMoBd.ttf
rename to poky/documentation/template/VeraMoBd.ttf
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/template/VeraMoBd.xml b/poky/documentation/template/VeraMoBd.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/template/VeraMoBd.xml
rename to poky/documentation/template/VeraMoBd.xml
diff --git a/import-layers/yocto-poky/documentation/template/VeraMono.ttf b/poky/documentation/template/VeraMono.ttf
similarity index 100%
rename from import-layers/yocto-poky/documentation/template/VeraMono.ttf
rename to poky/documentation/template/VeraMono.ttf
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/template/VeraMono.xml b/poky/documentation/template/VeraMono.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/template/VeraMono.xml
rename to poky/documentation/template/VeraMono.xml
diff --git a/import-layers/yocto-poky/documentation/template/component.title.xsl b/poky/documentation/template/component.title.xsl
similarity index 100%
rename from import-layers/yocto-poky/documentation/template/component.title.xsl
rename to poky/documentation/template/component.title.xsl
diff --git a/import-layers/yocto-poky/documentation/template/division.title.xsl b/poky/documentation/template/division.title.xsl
similarity index 100%
rename from import-layers/yocto-poky/documentation/template/division.title.xsl
rename to poky/documentation/template/division.title.xsl
diff --git a/import-layers/yocto-poky/documentation/template/draft.png b/poky/documentation/template/draft.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/template/draft.png
rename to poky/documentation/template/draft.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/template/embedded_video.xsl b/poky/documentation/template/embedded_video.xsl
similarity index 100%
rename from import-layers/yocto-poky/documentation/template/embedded_video.xsl
rename to poky/documentation/template/embedded_video.xsl
diff --git a/import-layers/yocto-poky/documentation/template/fop-config.xml b/poky/documentation/template/fop-config.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/template/fop-config.xml
rename to poky/documentation/template/fop-config.xml
diff --git a/import-layers/yocto-poky/documentation/template/formal.object.heading.xsl b/poky/documentation/template/formal.object.heading.xsl
similarity index 100%
rename from import-layers/yocto-poky/documentation/template/formal.object.heading.xsl
rename to poky/documentation/template/formal.object.heading.xsl
diff --git a/import-layers/yocto-poky/documentation/template/gloss-permalinks.xsl b/poky/documentation/template/gloss-permalinks.xsl
similarity index 100%
rename from import-layers/yocto-poky/documentation/template/gloss-permalinks.xsl
rename to poky/documentation/template/gloss-permalinks.xsl
diff --git a/import-layers/yocto-poky/documentation/template/ohand-color.svg b/poky/documentation/template/ohand-color.svg
similarity index 100%
rename from import-layers/yocto-poky/documentation/template/ohand-color.svg
rename to poky/documentation/template/ohand-color.svg
diff --git a/import-layers/yocto-poky/documentation/template/permalinks.xsl b/poky/documentation/template/permalinks.xsl
similarity index 100%
rename from import-layers/yocto-poky/documentation/template/permalinks.xsl
rename to poky/documentation/template/permalinks.xsl
diff --git a/import-layers/yocto-poky/documentation/template/poky-db-pdf.xsl b/poky/documentation/template/poky-db-pdf.xsl
similarity index 100%
rename from import-layers/yocto-poky/documentation/template/poky-db-pdf.xsl
rename to poky/documentation/template/poky-db-pdf.xsl
diff --git a/import-layers/yocto-poky/documentation/template/poky-ref-manual.png b/poky/documentation/template/poky-ref-manual.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/template/poky-ref-manual.png
rename to poky/documentation/template/poky-ref-manual.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/template/poky.svg b/poky/documentation/template/poky.svg
similarity index 100%
rename from import-layers/yocto-poky/documentation/template/poky.svg
rename to poky/documentation/template/poky.svg
diff --git a/import-layers/yocto-poky/documentation/template/qa-code-permalinks.xsl b/poky/documentation/template/qa-code-permalinks.xsl
similarity index 100%
rename from import-layers/yocto-poky/documentation/template/qa-code-permalinks.xsl
rename to poky/documentation/template/qa-code-permalinks.xsl
diff --git a/import-layers/yocto-poky/documentation/template/section.title.xsl b/poky/documentation/template/section.title.xsl
similarity index 100%
rename from import-layers/yocto-poky/documentation/template/section.title.xsl
rename to poky/documentation/template/section.title.xsl
diff --git a/import-layers/yocto-poky/documentation/template/titlepage.templates.xml b/poky/documentation/template/titlepage.templates.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/template/titlepage.templates.xml
rename to poky/documentation/template/titlepage.templates.xml
diff --git a/import-layers/yocto-poky/documentation/template/yocto-project-qs.png b/poky/documentation/template/yocto-project-qs.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/template/yocto-project-qs.png
rename to poky/documentation/template/yocto-project-qs.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/toaster-manual/figures/add-variable.png b/poky/documentation/toaster-manual/figures/add-variable.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/toaster-manual/figures/add-variable.png
rename to poky/documentation/toaster-manual/figures/add-variable.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/toaster-manual/figures/bash-oecore.png b/poky/documentation/toaster-manual/figures/bash-oecore.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/toaster-manual/figures/bash-oecore.png
rename to poky/documentation/toaster-manual/figures/bash-oecore.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/toaster-manual/figures/compatible-layers.png b/poky/documentation/toaster-manual/figures/compatible-layers.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/toaster-manual/figures/compatible-layers.png
rename to poky/documentation/toaster-manual/figures/compatible-layers.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/toaster-manual/figures/hosted-service.png b/poky/documentation/toaster-manual/figures/hosted-service.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/toaster-manual/figures/hosted-service.png
rename to poky/documentation/toaster-manual/figures/hosted-service.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/toaster-manual/figures/import-layer.png b/poky/documentation/toaster-manual/figures/import-layer.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/toaster-manual/figures/import-layer.png
rename to poky/documentation/toaster-manual/figures/import-layer.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/toaster-manual/figures/new-project.png b/poky/documentation/toaster-manual/figures/new-project.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/toaster-manual/figures/new-project.png
rename to poky/documentation/toaster-manual/figures/new-project.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/toaster-manual/figures/set-variable.png b/poky/documentation/toaster-manual/figures/set-variable.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/toaster-manual/figures/set-variable.png
rename to poky/documentation/toaster-manual/figures/set-variable.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/toaster-manual/figures/simple-configuration.png b/poky/documentation/toaster-manual/figures/simple-configuration.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/toaster-manual/figures/simple-configuration.png
rename to poky/documentation/toaster-manual/figures/simple-configuration.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/toaster-manual/figures/toaster-title.png b/poky/documentation/toaster-manual/figures/toaster-title.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/toaster-manual/figures/toaster-title.png
rename to poky/documentation/toaster-manual/figures/toaster-title.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/toaster-manual/figures/variable-added.png b/poky/documentation/toaster-manual/figures/variable-added.png
similarity index 100%
rename from import-layers/yocto-poky/documentation/toaster-manual/figures/variable-added.png
rename to poky/documentation/toaster-manual/figures/variable-added.png
Binary files differ
diff --git a/import-layers/yocto-poky/documentation/toaster-manual/toaster-manual-customization.xsl b/poky/documentation/toaster-manual/toaster-manual-customization.xsl
similarity index 100%
rename from import-layers/yocto-poky/documentation/toaster-manual/toaster-manual-customization.xsl
rename to poky/documentation/toaster-manual/toaster-manual-customization.xsl
diff --git a/import-layers/yocto-poky/documentation/toaster-manual/toaster-manual-intro.xml b/poky/documentation/toaster-manual/toaster-manual-intro.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/toaster-manual/toaster-manual-intro.xml
rename to poky/documentation/toaster-manual/toaster-manual-intro.xml
diff --git a/import-layers/yocto-poky/documentation/toaster-manual/toaster-manual-reference.xml b/poky/documentation/toaster-manual/toaster-manual-reference.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/toaster-manual/toaster-manual-reference.xml
rename to poky/documentation/toaster-manual/toaster-manual-reference.xml
diff --git a/import-layers/yocto-poky/documentation/toaster-manual/toaster-manual-setup-and-use.xml b/poky/documentation/toaster-manual/toaster-manual-setup-and-use.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/toaster-manual/toaster-manual-setup-and-use.xml
rename to poky/documentation/toaster-manual/toaster-manual-setup-and-use.xml
diff --git a/import-layers/yocto-poky/documentation/toaster-manual/toaster-manual-start.xml b/poky/documentation/toaster-manual/toaster-manual-start.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/toaster-manual/toaster-manual-start.xml
rename to poky/documentation/toaster-manual/toaster-manual-start.xml
diff --git a/import-layers/yocto-poky/documentation/toaster-manual/toaster-manual-style.css b/poky/documentation/toaster-manual/toaster-manual-style.css
similarity index 100%
rename from import-layers/yocto-poky/documentation/toaster-manual/toaster-manual-style.css
rename to poky/documentation/toaster-manual/toaster-manual-style.css
diff --git a/import-layers/yocto-poky/documentation/toaster-manual/toaster-manual.xml b/poky/documentation/toaster-manual/toaster-manual.xml
similarity index 100%
rename from import-layers/yocto-poky/documentation/toaster-manual/toaster-manual.xml
rename to poky/documentation/toaster-manual/toaster-manual.xml
diff --git a/import-layers/yocto-poky/documentation/tools/eclipse-help.sed b/poky/documentation/tools/eclipse-help.sed
similarity index 100%
rename from import-layers/yocto-poky/documentation/tools/eclipse-help.sed
rename to poky/documentation/tools/eclipse-help.sed
diff --git a/import-layers/yocto-poky/documentation/tools/mega-manual.sed b/poky/documentation/tools/mega-manual.sed
similarity index 100%
rename from import-layers/yocto-poky/documentation/tools/mega-manual.sed
rename to poky/documentation/tools/mega-manual.sed
diff --git a/import-layers/yocto-poky/documentation/tools/poky-docbook-to-pdf b/poky/documentation/tools/poky-docbook-to-pdf
similarity index 100%
rename from import-layers/yocto-poky/documentation/tools/poky-docbook-to-pdf
rename to poky/documentation/tools/poky-docbook-to-pdf
diff --git a/import-layers/yocto-poky/documentation/tools/update-documentation-conf b/poky/documentation/tools/update-documentation-conf
similarity index 100%
rename from import-layers/yocto-poky/documentation/tools/update-documentation-conf
rename to poky/documentation/tools/update-documentation-conf
diff --git a/import-layers/yocto-poky/meta-poky/README.poky b/poky/meta-poky/README.poky
similarity index 100%
rename from import-layers/yocto-poky/meta-poky/README.poky
rename to poky/meta-poky/README.poky
diff --git a/import-layers/yocto-poky/meta-poky/classes/poky-sanity.bbclass b/poky/meta-poky/classes/poky-sanity.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta-poky/classes/poky-sanity.bbclass
rename to poky/meta-poky/classes/poky-sanity.bbclass
diff --git a/import-layers/yocto-poky/meta-poky/conf/bblayers.conf.sample b/poky/meta-poky/conf/bblayers.conf.sample
similarity index 100%
rename from import-layers/yocto-poky/meta-poky/conf/bblayers.conf.sample
rename to poky/meta-poky/conf/bblayers.conf.sample
diff --git a/import-layers/yocto-poky/meta-poky/conf/conf-notes.txt b/poky/meta-poky/conf/conf-notes.txt
similarity index 100%
rename from import-layers/yocto-poky/meta-poky/conf/conf-notes.txt
rename to poky/meta-poky/conf/conf-notes.txt
diff --git a/import-layers/yocto-poky/meta-poky/conf/distro/include/poky-floating-revisions.inc b/poky/meta-poky/conf/distro/include/poky-floating-revisions.inc
similarity index 100%
rename from import-layers/yocto-poky/meta-poky/conf/distro/include/poky-floating-revisions.inc
rename to poky/meta-poky/conf/distro/include/poky-floating-revisions.inc
diff --git a/import-layers/yocto-poky/meta-poky/conf/distro/include/poky-world-exclude.inc b/poky/meta-poky/conf/distro/include/poky-world-exclude.inc
similarity index 100%
rename from import-layers/yocto-poky/meta-poky/conf/distro/include/poky-world-exclude.inc
rename to poky/meta-poky/conf/distro/include/poky-world-exclude.inc
diff --git a/import-layers/yocto-poky/meta-poky/conf/distro/poky-bleeding.conf b/poky/meta-poky/conf/distro/poky-bleeding.conf
similarity index 100%
rename from import-layers/yocto-poky/meta-poky/conf/distro/poky-bleeding.conf
rename to poky/meta-poky/conf/distro/poky-bleeding.conf
diff --git a/import-layers/yocto-poky/meta-poky/conf/distro/poky-lsb.conf b/poky/meta-poky/conf/distro/poky-lsb.conf
similarity index 100%
rename from import-layers/yocto-poky/meta-poky/conf/distro/poky-lsb.conf
rename to poky/meta-poky/conf/distro/poky-lsb.conf
diff --git a/import-layers/yocto-poky/meta-poky/conf/distro/poky-tiny.conf b/poky/meta-poky/conf/distro/poky-tiny.conf
similarity index 100%
rename from import-layers/yocto-poky/meta-poky/conf/distro/poky-tiny.conf
rename to poky/meta-poky/conf/distro/poky-tiny.conf
diff --git a/import-layers/yocto-poky/meta-poky/conf/distro/poky.conf b/poky/meta-poky/conf/distro/poky.conf
similarity index 100%
rename from import-layers/yocto-poky/meta-poky/conf/distro/poky.conf
rename to poky/meta-poky/conf/distro/poky.conf
diff --git a/import-layers/yocto-poky/meta-poky/conf/layer.conf b/poky/meta-poky/conf/layer.conf
similarity index 100%
rename from import-layers/yocto-poky/meta-poky/conf/layer.conf
rename to poky/meta-poky/conf/layer.conf
diff --git a/import-layers/yocto-poky/meta-poky/conf/local.conf.sample b/poky/meta-poky/conf/local.conf.sample
similarity index 100%
rename from import-layers/yocto-poky/meta-poky/conf/local.conf.sample
rename to poky/meta-poky/conf/local.conf.sample
diff --git a/import-layers/yocto-poky/meta-poky/conf/local.conf.sample.extended b/poky/meta-poky/conf/local.conf.sample.extended
similarity index 100%
rename from import-layers/yocto-poky/meta-poky/conf/local.conf.sample.extended
rename to poky/meta-poky/conf/local.conf.sample.extended
diff --git a/import-layers/yocto-poky/meta-poky/conf/site.conf.sample b/poky/meta-poky/conf/site.conf.sample
similarity index 100%
rename from import-layers/yocto-poky/meta-poky/conf/site.conf.sample
rename to poky/meta-poky/conf/site.conf.sample
diff --git a/import-layers/yocto-poky/meta-poky/recipes-core/busybox/busybox/poky-tiny/defconfig b/poky/meta-poky/recipes-core/busybox/busybox/poky-tiny/defconfig
similarity index 100%
rename from import-layers/yocto-poky/meta-poky/recipes-core/busybox/busybox/poky-tiny/defconfig
rename to poky/meta-poky/recipes-core/busybox/busybox/poky-tiny/defconfig
diff --git a/import-layers/yocto-poky/meta-poky/recipes-core/busybox/busybox_%.bbappend b/poky/meta-poky/recipes-core/busybox/busybox_%.bbappend
similarity index 100%
rename from import-layers/yocto-poky/meta-poky/recipes-core/busybox/busybox_%.bbappend
rename to poky/meta-poky/recipes-core/busybox/busybox_%.bbappend
diff --git a/import-layers/yocto-poky/meta-poky/recipes-core/psplash/files/psplash-poky-img.h b/poky/meta-poky/recipes-core/psplash/files/psplash-poky-img.h
similarity index 100%
rename from import-layers/yocto-poky/meta-poky/recipes-core/psplash/files/psplash-poky-img.h
rename to poky/meta-poky/recipes-core/psplash/files/psplash-poky-img.h
diff --git a/import-layers/yocto-poky/meta-poky/recipes-core/psplash/psplash_git.bbappend b/poky/meta-poky/recipes-core/psplash/psplash_git.bbappend
similarity index 100%
rename from import-layers/yocto-poky/meta-poky/recipes-core/psplash/psplash_git.bbappend
rename to poky/meta-poky/recipes-core/psplash/psplash_git.bbappend
diff --git a/import-layers/yocto-poky/meta-poky/recipes-core/tiny-init/files/init b/poky/meta-poky/recipes-core/tiny-init/files/init
similarity index 100%
rename from import-layers/yocto-poky/meta-poky/recipes-core/tiny-init/files/init
rename to poky/meta-poky/recipes-core/tiny-init/files/init
diff --git a/import-layers/yocto-poky/meta-poky/recipes-core/tiny-init/files/rc.local.sample b/poky/meta-poky/recipes-core/tiny-init/files/rc.local.sample
similarity index 100%
rename from import-layers/yocto-poky/meta-poky/recipes-core/tiny-init/files/rc.local.sample
rename to poky/meta-poky/recipes-core/tiny-init/files/rc.local.sample
diff --git a/import-layers/yocto-poky/meta-poky/recipes-core/tiny-init/tiny-init.bb b/poky/meta-poky/recipes-core/tiny-init/tiny-init.bb
similarity index 100%
rename from import-layers/yocto-poky/meta-poky/recipes-core/tiny-init/tiny-init.bb
rename to poky/meta-poky/recipes-core/tiny-init/tiny-init.bb
diff --git a/import-layers/yocto-poky/meta-selftest/COPYING.MIT b/poky/meta-selftest/COPYING.MIT
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/COPYING.MIT
rename to poky/meta-selftest/COPYING.MIT
diff --git a/import-layers/yocto-poky/meta-selftest/README b/poky/meta-selftest/README
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/README
rename to poky/meta-selftest/README
diff --git a/import-layers/yocto-poky/meta-selftest/classes/test_events.bbclass b/poky/meta-selftest/classes/test_events.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/classes/test_events.bbclass
rename to poky/meta-selftest/classes/test_events.bbclass
diff --git a/import-layers/yocto-poky/meta-selftest/conf/layer.conf b/poky/meta-selftest/conf/layer.conf
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/conf/layer.conf
rename to poky/meta-selftest/conf/layer.conf
diff --git a/import-layers/yocto-poky/meta-selftest/conf/machine/qemux86copy.conf b/poky/meta-selftest/conf/machine/qemux86copy.conf
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/conf/machine/qemux86copy.conf
rename to poky/meta-selftest/conf/machine/qemux86copy.conf
diff --git a/import-layers/yocto-poky/meta-selftest/files/signing/key.passphrase b/poky/meta-selftest/files/signing/key.passphrase
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/files/signing/key.passphrase
rename to poky/meta-selftest/files/signing/key.passphrase
diff --git a/import-layers/yocto-poky/meta-selftest/files/signing/key.pub b/poky/meta-selftest/files/signing/key.pub
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/files/signing/key.pub
rename to poky/meta-selftest/files/signing/key.pub
diff --git a/import-layers/yocto-poky/meta-selftest/files/signing/key.secret b/poky/meta-selftest/files/signing/key.secret
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/files/signing/key.secret
rename to poky/meta-selftest/files/signing/key.secret
diff --git a/import-layers/yocto-poky/meta-selftest/files/static-group b/poky/meta-selftest/files/static-group
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/files/static-group
rename to poky/meta-selftest/files/static-group
diff --git a/import-layers/yocto-poky/meta-selftest/files/static-passwd b/poky/meta-selftest/files/static-passwd
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/files/static-passwd
rename to poky/meta-selftest/files/static-passwd
diff --git a/import-layers/yocto-poky/meta-selftest/lib/devtool/__init__.py b/poky/meta-selftest/lib/devtool/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/lib/devtool/__init__.py
rename to poky/meta-selftest/lib/devtool/__init__.py
diff --git a/import-layers/yocto-poky/meta-selftest/lib/devtool/bbpath.py b/poky/meta-selftest/lib/devtool/bbpath.py
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/lib/devtool/bbpath.py
rename to poky/meta-selftest/lib/devtool/bbpath.py
diff --git a/import-layers/yocto-poky/meta-selftest/lib/devtool/test.py b/poky/meta-selftest/lib/devtool/test.py
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/lib/devtool/test.py
rename to poky/meta-selftest/lib/devtool/test.py
diff --git a/import-layers/yocto-poky/meta-selftest/lib/oeqa/runtime/cases/dnf_runtime.py b/poky/meta-selftest/lib/oeqa/runtime/cases/dnf_runtime.py
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/lib/oeqa/runtime/cases/dnf_runtime.py
rename to poky/meta-selftest/lib/oeqa/runtime/cases/dnf_runtime.py
diff --git a/import-layers/yocto-poky/meta-selftest/lib/oeqa/runtime/cases/selftest.json b/poky/meta-selftest/lib/oeqa/runtime/cases/selftest.json
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/lib/oeqa/runtime/cases/selftest.json
rename to poky/meta-selftest/lib/oeqa/runtime/cases/selftest.json
diff --git a/import-layers/yocto-poky/meta-selftest/lib/oeqa/runtime/cases/selftest.py b/poky/meta-selftest/lib/oeqa/runtime/cases/selftest.py
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/lib/oeqa/runtime/cases/selftest.py
rename to poky/meta-selftest/lib/oeqa/runtime/cases/selftest.py
diff --git a/import-layers/yocto-poky/meta-selftest/lib/oeqa/selftest/cases/external-layer.py b/poky/meta-selftest/lib/oeqa/selftest/cases/external-layer.py
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/lib/oeqa/selftest/cases/external-layer.py
rename to poky/meta-selftest/lib/oeqa/selftest/cases/external-layer.py
diff --git a/import-layers/yocto-poky/meta-selftest/lib/recipetool/bbpath.py b/poky/meta-selftest/lib/recipetool/bbpath.py
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/lib/recipetool/bbpath.py
rename to poky/meta-selftest/lib/recipetool/bbpath.py
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/aspell/aspell_0.0.0.1.bb b/poky/meta-selftest/recipes-test/aspell/aspell_0.0.0.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/aspell/aspell_0.0.0.1.bb
rename to poky/meta-selftest/recipes-test/aspell/aspell_0.0.0.1.bb
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/aspell/aspell_0.60.6.1.bbappend b/poky/meta-selftest/recipes-test/aspell/aspell_0.60.6.1.bbappend
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/aspell/aspell_0.60.6.1.bbappend
rename to poky/meta-selftest/recipes-test/aspell/aspell_0.60.6.1.bbappend
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/container-image/container-image-testpkg.bb b/poky/meta-selftest/recipes-test/container-image/container-image-testpkg.bb
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/container-image/container-image-testpkg.bb
rename to poky/meta-selftest/recipes-test/container-image/container-image-testpkg.bb
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/container-image/container-test-image.bb b/poky/meta-selftest/recipes-test/container-image/container-test-image.bb
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/container-image/container-test-image.bb
rename to poky/meta-selftest/recipes-test/container-image/container-test-image.bb
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/devtool/devtool-test-local/file1 b/poky/meta-selftest/recipes-test/devtool/devtool-test-local/file1
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/devtool/devtool-test-local/file1
rename to poky/meta-selftest/recipes-test/devtool/devtool-test-local/file1
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/devtool/devtool-test-local/file2 b/poky/meta-selftest/recipes-test/devtool/devtool-test-local/file2
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/devtool/devtool-test-local/file2
rename to poky/meta-selftest/recipes-test/devtool/devtool-test-local/file2
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/devtool/devtool-test-local_6.03.bb b/poky/meta-selftest/recipes-test/devtool/devtool-test-local_6.03.bb
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/devtool/devtool-test-local_6.03.bb
rename to poky/meta-selftest/recipes-test/devtool/devtool-test-local_6.03.bb
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/devtool/devtool-test-localonly.bb b/poky/meta-selftest/recipes-test/devtool/devtool-test-localonly.bb
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/devtool/devtool-test-localonly.bb
rename to poky/meta-selftest/recipes-test/devtool/devtool-test-localonly.bb
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/devtool/devtool-test-localonly/file1 b/poky/meta-selftest/recipes-test/devtool/devtool-test-localonly/file1
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/devtool/devtool-test-localonly/file1
rename to poky/meta-selftest/recipes-test/devtool/devtool-test-localonly/file1
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/devtool/devtool-test-localonly/file2 b/poky/meta-selftest/recipes-test/devtool/devtool-test-localonly/file2
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/devtool/devtool-test-localonly/file2
rename to poky/meta-selftest/recipes-test/devtool/devtool-test-localonly/file2
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/devtool/devtool-test-patch-gz.bb b/poky/meta-selftest/recipes-test/devtool/devtool-test-patch-gz.bb
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/devtool/devtool-test-patch-gz.bb
rename to poky/meta-selftest/recipes-test/devtool/devtool-test-patch-gz.bb
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/devtool/devtool-test-patch-gz/readme.patch.gz b/poky/meta-selftest/recipes-test/devtool/devtool-test-patch-gz/readme.patch.gz
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/devtool/devtool-test-patch-gz/readme.patch.gz
rename to poky/meta-selftest/recipes-test/devtool/devtool-test-patch-gz/readme.patch.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/devtool/devtool-test-subdir.bb b/poky/meta-selftest/recipes-test/devtool/devtool-test-subdir.bb
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/devtool/devtool-test-subdir.bb
rename to poky/meta-selftest/recipes-test/devtool/devtool-test-subdir.bb
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/devtool/devtool-test-subdir/devtool-test-subdir.tar.gz b/poky/meta-selftest/recipes-test/devtool/devtool-test-subdir/devtool-test-subdir.tar.gz
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/devtool/devtool-test-subdir/devtool-test-subdir.tar.gz
rename to poky/meta-selftest/recipes-test/devtool/devtool-test-subdir/devtool-test-subdir.tar.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/devtool/devtool-test-subdir/testfile b/poky/meta-selftest/recipes-test/devtool/devtool-test-subdir/testfile
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/devtool/devtool-test-subdir/testfile
rename to poky/meta-selftest/recipes-test/devtool/devtool-test-subdir/testfile
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/devtool/devtool-upgrade-test1-1.5.3/0001-Add-a-note-line-to-the-quick-reference.patch b/poky/meta-selftest/recipes-test/devtool/devtool-upgrade-test1-1.5.3/0001-Add-a-note-line-to-the-quick-reference.patch
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/devtool/devtool-upgrade-test1-1.5.3/0001-Add-a-note-line-to-the-quick-reference.patch
rename to poky/meta-selftest/recipes-test/devtool/devtool-upgrade-test1-1.5.3/0001-Add-a-note-line-to-the-quick-reference.patch
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/devtool/devtool-upgrade-test1_1.5.3.bb b/poky/meta-selftest/recipes-test/devtool/devtool-upgrade-test1_1.5.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/devtool/devtool-upgrade-test1_1.5.3.bb
rename to poky/meta-selftest/recipes-test/devtool/devtool-upgrade-test1_1.5.3.bb
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/devtool/devtool-upgrade-test1_1.5.3.bb.upgraded b/poky/meta-selftest/recipes-test/devtool/devtool-upgrade-test1_1.5.3.bb.upgraded
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/devtool/devtool-upgrade-test1_1.5.3.bb.upgraded
rename to poky/meta-selftest/recipes-test/devtool/devtool-upgrade-test1_1.5.3.bb.upgraded
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb b/poky/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb
rename to poky/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb.upgraded b/poky/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb.upgraded
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb.upgraded
rename to poky/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb.upgraded
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/emptytest/emptytest.bb b/poky/meta-selftest/recipes-test/emptytest/emptytest.bb
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/emptytest/emptytest.bb
rename to poky/meta-selftest/recipes-test/emptytest/emptytest.bb
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/error/error.bb b/poky/meta-selftest/recipes-test/error/error.bb
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/error/error.bb
rename to poky/meta-selftest/recipes-test/error/error.bb
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/images/error-image.bb b/poky/meta-selftest/recipes-test/images/error-image.bb
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/images/error-image.bb
rename to poky/meta-selftest/recipes-test/images/error-image.bb
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/images/oe-selftest-image.bb b/poky/meta-selftest/recipes-test/images/oe-selftest-image.bb
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/images/oe-selftest-image.bb
rename to poky/meta-selftest/recipes-test/images/oe-selftest-image.bb
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/images/test-empty-image.bb b/poky/meta-selftest/recipes-test/images/test-empty-image.bb
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/images/test-empty-image.bb
rename to poky/meta-selftest/recipes-test/images/test-empty-image.bb
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/images/wic-image-minimal.bb b/poky/meta-selftest/recipes-test/images/wic-image-minimal.bb
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/images/wic-image-minimal.bb
rename to poky/meta-selftest/recipes-test/images/wic-image-minimal.bb
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/images/wic-image-minimal.wks b/poky/meta-selftest/recipes-test/images/wic-image-minimal.wks
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/images/wic-image-minimal.wks
rename to poky/meta-selftest/recipes-test/images/wic-image-minimal.wks
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/m4/m4_%.bbappend b/poky/meta-selftest/recipes-test/m4/m4_%.bbappend
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/m4/m4_%.bbappend
rename to poky/meta-selftest/recipes-test/m4/m4_%.bbappend
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/man-db/files/0001-Test-patch-here.patch b/poky/meta-selftest/recipes-test/man-db/files/0001-Test-patch-here.patch
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/man-db/files/0001-Test-patch-here.patch
rename to poky/meta-selftest/recipes-test/man-db/files/0001-Test-patch-here.patch
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/man-db/man-db_%.bbappend b/poky/meta-selftest/recipes-test/man-db/man-db_%.bbappend
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/man-db/man-db_%.bbappend
rename to poky/meta-selftest/recipes-test/man-db/man-db_%.bbappend
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/postinst/postinst_1.0.bb b/poky/meta-selftest/recipes-test/postinst/postinst_1.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/postinst/postinst_1.0.bb
rename to poky/meta-selftest/recipes-test/postinst/postinst_1.0.bb
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/recipetool/files/add-file.patch b/poky/meta-selftest/recipes-test/recipetool/files/add-file.patch
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/recipetool/files/add-file.patch
rename to poky/meta-selftest/recipes-test/recipetool/files/add-file.patch
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/recipetool/files/file1 b/poky/meta-selftest/recipes-test/recipetool/files/file1
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/recipetool/files/file1
rename to poky/meta-selftest/recipes-test/recipetool/files/file1
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/recipetool/files/installscript.sh b/poky/meta-selftest/recipes-test/recipetool/files/installscript.sh
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/recipetool/files/installscript.sh
rename to poky/meta-selftest/recipes-test/recipetool/files/installscript.sh
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-inst-func b/poky/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-inst-func
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-inst-func
rename to poky/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-inst-func
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-inst-globfile b/poky/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-inst-globfile
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-inst-globfile
rename to poky/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-inst-globfile
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-inst-todir-globfile b/poky/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-inst-todir-globfile
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-inst-todir-globfile
rename to poky/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-inst-todir-globfile
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-orig b/poky/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-orig
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-orig
rename to poky/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-orig
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-src-globfile b/poky/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-src-globfile
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-src-globfile
rename to poky/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-src-globfile
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-todir b/poky/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-todir
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-todir
rename to poky/meta-selftest/recipes-test/recipetool/files/selftest-replaceme-todir
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/recipetool/files/subdir/fileinsubdir b/poky/meta-selftest/recipes-test/recipetool/files/subdir/fileinsubdir
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/recipetool/files/subdir/fileinsubdir
rename to poky/meta-selftest/recipes-test/recipetool/files/subdir/fileinsubdir
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/recipetool/selftest-recipetool-appendfile.bb b/poky/meta-selftest/recipes-test/recipetool/selftest-recipetool-appendfile.bb
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/recipetool/selftest-recipetool-appendfile.bb
rename to poky/meta-selftest/recipes-test/recipetool/selftest-recipetool-appendfile.bb
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/selftest-ed/selftest-ed_0.5.bb b/poky/meta-selftest/recipes-test/selftest-ed/selftest-ed_0.5.bb
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/selftest-ed/selftest-ed_0.5.bb
rename to poky/meta-selftest/recipes-test/selftest-ed/selftest-ed_0.5.bb
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/selftest-ed/selftest-ed_1.14.1.bb b/poky/meta-selftest/recipes-test/selftest-ed/selftest-ed_1.14.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/selftest-ed/selftest-ed_1.14.1.bb
rename to poky/meta-selftest/recipes-test/selftest-ed/selftest-ed_1.14.1.bb
diff --git a/import-layers/yocto-poky/meta-selftest/recipes-test/xcursor-transparent-theme/xcursor-transparent-theme_%.bbappend b/poky/meta-selftest/recipes-test/xcursor-transparent-theme/xcursor-transparent-theme_%.bbappend
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/recipes-test/xcursor-transparent-theme/xcursor-transparent-theme_%.bbappend
rename to poky/meta-selftest/recipes-test/xcursor-transparent-theme/xcursor-transparent-theme_%.bbappend
diff --git a/import-layers/yocto-poky/meta-selftest/wic/test_rawcopy_plugin.wks.in b/poky/meta-selftest/wic/test_rawcopy_plugin.wks.in
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/wic/test_rawcopy_plugin.wks.in
rename to poky/meta-selftest/wic/test_rawcopy_plugin.wks.in
diff --git a/import-layers/yocto-poky/meta-selftest/wic/wictestdisk.wks b/poky/meta-selftest/wic/wictestdisk.wks
similarity index 100%
rename from import-layers/yocto-poky/meta-selftest/wic/wictestdisk.wks
rename to poky/meta-selftest/wic/wictestdisk.wks
diff --git a/import-layers/yocto-poky/meta-skeleton/COPYING.MIT b/poky/meta-skeleton/COPYING.MIT
similarity index 100%
rename from import-layers/yocto-poky/meta-skeleton/COPYING.MIT
rename to poky/meta-skeleton/COPYING.MIT
diff --git a/import-layers/yocto-poky/meta-skeleton/conf/layer.conf b/poky/meta-skeleton/conf/layer.conf
similarity index 100%
rename from import-layers/yocto-poky/meta-skeleton/conf/layer.conf
rename to poky/meta-skeleton/conf/layer.conf
diff --git a/import-layers/yocto-poky/meta-skeleton/conf/multilib-example.conf b/poky/meta-skeleton/conf/multilib-example.conf
similarity index 100%
rename from import-layers/yocto-poky/meta-skeleton/conf/multilib-example.conf
rename to poky/meta-skeleton/conf/multilib-example.conf
diff --git a/import-layers/yocto-poky/meta-skeleton/conf/multilib-example2.conf b/poky/meta-skeleton/conf/multilib-example2.conf
similarity index 100%
rename from import-layers/yocto-poky/meta-skeleton/conf/multilib-example2.conf
rename to poky/meta-skeleton/conf/multilib-example2.conf
diff --git a/import-layers/yocto-poky/meta-skeleton/recipes-core/busybox/busybox/no_rfkill.cfg b/poky/meta-skeleton/recipes-core/busybox/busybox/no_rfkill.cfg
similarity index 100%
rename from import-layers/yocto-poky/meta-skeleton/recipes-core/busybox/busybox/no_rfkill.cfg
rename to poky/meta-skeleton/recipes-core/busybox/busybox/no_rfkill.cfg
diff --git a/import-layers/yocto-poky/meta-skeleton/recipes-core/busybox/busybox_%.bbappend b/poky/meta-skeleton/recipes-core/busybox/busybox_%.bbappend
similarity index 100%
rename from import-layers/yocto-poky/meta-skeleton/recipes-core/busybox/busybox_%.bbappend
rename to poky/meta-skeleton/recipes-core/busybox/busybox_%.bbappend
diff --git a/import-layers/yocto-poky/meta-skeleton/recipes-kernel/hello-mod/files/COPYING b/poky/meta-skeleton/recipes-kernel/hello-mod/files/COPYING
similarity index 100%
rename from import-layers/yocto-poky/meta-skeleton/recipes-kernel/hello-mod/files/COPYING
rename to poky/meta-skeleton/recipes-kernel/hello-mod/files/COPYING
diff --git a/import-layers/yocto-poky/meta-skeleton/recipes-kernel/hello-mod/files/Makefile b/poky/meta-skeleton/recipes-kernel/hello-mod/files/Makefile
similarity index 100%
rename from import-layers/yocto-poky/meta-skeleton/recipes-kernel/hello-mod/files/Makefile
rename to poky/meta-skeleton/recipes-kernel/hello-mod/files/Makefile
diff --git a/import-layers/yocto-poky/meta-skeleton/recipes-kernel/hello-mod/files/hello.c b/poky/meta-skeleton/recipes-kernel/hello-mod/files/hello.c
similarity index 100%
rename from import-layers/yocto-poky/meta-skeleton/recipes-kernel/hello-mod/files/hello.c
rename to poky/meta-skeleton/recipes-kernel/hello-mod/files/hello.c
diff --git a/import-layers/yocto-poky/meta-skeleton/recipes-kernel/hello-mod/hello-mod_0.1.bb b/poky/meta-skeleton/recipes-kernel/hello-mod/hello-mod_0.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta-skeleton/recipes-kernel/hello-mod/hello-mod_0.1.bb
rename to poky/meta-skeleton/recipes-kernel/hello-mod/hello-mod_0.1.bb
diff --git a/import-layers/yocto-poky/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb b/poky/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
similarity index 100%
rename from import-layers/yocto-poky/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
rename to poky/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
diff --git a/import-layers/yocto-poky/meta-skeleton/recipes-kernel/linux/linux-yocto-custom/0001-linux-version-tweak.patch b/poky/meta-skeleton/recipes-kernel/linux/linux-yocto-custom/0001-linux-version-tweak.patch
similarity index 100%
rename from import-layers/yocto-poky/meta-skeleton/recipes-kernel/linux/linux-yocto-custom/0001-linux-version-tweak.patch
rename to poky/meta-skeleton/recipes-kernel/linux/linux-yocto-custom/0001-linux-version-tweak.patch
diff --git a/import-layers/yocto-poky/meta-skeleton/recipes-kernel/linux/linux-yocto-custom/feature.scc b/poky/meta-skeleton/recipes-kernel/linux/linux-yocto-custom/feature.scc
similarity index 100%
rename from import-layers/yocto-poky/meta-skeleton/recipes-kernel/linux/linux-yocto-custom/feature.scc
rename to poky/meta-skeleton/recipes-kernel/linux/linux-yocto-custom/feature.scc
diff --git a/import-layers/yocto-poky/meta-skeleton/recipes-kernel/linux/linux-yocto-custom/smp.cfg b/poky/meta-skeleton/recipes-kernel/linux/linux-yocto-custom/smp.cfg
similarity index 100%
rename from import-layers/yocto-poky/meta-skeleton/recipes-kernel/linux/linux-yocto-custom/smp.cfg
rename to poky/meta-skeleton/recipes-kernel/linux/linux-yocto-custom/smp.cfg
diff --git a/import-layers/yocto-poky/meta-skeleton/recipes-multilib/images/core-image-multilib-example.bb b/poky/meta-skeleton/recipes-multilib/images/core-image-multilib-example.bb
similarity index 100%
rename from import-layers/yocto-poky/meta-skeleton/recipes-multilib/images/core-image-multilib-example.bb
rename to poky/meta-skeleton/recipes-multilib/images/core-image-multilib-example.bb
diff --git a/import-layers/yocto-poky/meta-skeleton/recipes-skeleton/service/service/COPYRIGHT b/poky/meta-skeleton/recipes-skeleton/service/service/COPYRIGHT
similarity index 100%
rename from import-layers/yocto-poky/meta-skeleton/recipes-skeleton/service/service/COPYRIGHT
rename to poky/meta-skeleton/recipes-skeleton/service/service/COPYRIGHT
diff --git a/import-layers/yocto-poky/meta-skeleton/recipes-skeleton/service/service/skeleton b/poky/meta-skeleton/recipes-skeleton/service/service/skeleton
similarity index 100%
rename from import-layers/yocto-poky/meta-skeleton/recipes-skeleton/service/service/skeleton
rename to poky/meta-skeleton/recipes-skeleton/service/service/skeleton
diff --git a/import-layers/yocto-poky/meta-skeleton/recipes-skeleton/service/service/skeleton_test.c b/poky/meta-skeleton/recipes-skeleton/service/service/skeleton_test.c
similarity index 100%
rename from import-layers/yocto-poky/meta-skeleton/recipes-skeleton/service/service/skeleton_test.c
rename to poky/meta-skeleton/recipes-skeleton/service/service/skeleton_test.c
diff --git a/import-layers/yocto-poky/meta-skeleton/recipes-skeleton/service/service_0.1.bb b/poky/meta-skeleton/recipes-skeleton/service/service_0.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta-skeleton/recipes-skeleton/service/service_0.1.bb
rename to poky/meta-skeleton/recipes-skeleton/service/service_0.1.bb
diff --git a/import-layers/yocto-poky/meta-skeleton/recipes-skeleton/useradd/useradd-example.bb b/poky/meta-skeleton/recipes-skeleton/useradd/useradd-example.bb
similarity index 100%
rename from import-layers/yocto-poky/meta-skeleton/recipes-skeleton/useradd/useradd-example.bb
rename to poky/meta-skeleton/recipes-skeleton/useradd/useradd-example.bb
diff --git a/import-layers/yocto-poky/meta-skeleton/recipes-skeleton/useradd/useradd-example/file1 b/poky/meta-skeleton/recipes-skeleton/useradd/useradd-example/file1
similarity index 100%
rename from import-layers/yocto-poky/meta-skeleton/recipes-skeleton/useradd/useradd-example/file1
rename to poky/meta-skeleton/recipes-skeleton/useradd/useradd-example/file1
diff --git a/import-layers/yocto-poky/meta-skeleton/recipes-skeleton/useradd/useradd-example/file2 b/poky/meta-skeleton/recipes-skeleton/useradd/useradd-example/file2
similarity index 100%
rename from import-layers/yocto-poky/meta-skeleton/recipes-skeleton/useradd/useradd-example/file2
rename to poky/meta-skeleton/recipes-skeleton/useradd/useradd-example/file2
diff --git a/import-layers/yocto-poky/meta-skeleton/recipes-skeleton/useradd/useradd-example/file3 b/poky/meta-skeleton/recipes-skeleton/useradd/useradd-example/file3
similarity index 100%
rename from import-layers/yocto-poky/meta-skeleton/recipes-skeleton/useradd/useradd-example/file3
rename to poky/meta-skeleton/recipes-skeleton/useradd/useradd-example/file3
diff --git a/import-layers/yocto-poky/meta-skeleton/recipes-skeleton/useradd/useradd-example/file4 b/poky/meta-skeleton/recipes-skeleton/useradd/useradd-example/file4
similarity index 100%
rename from import-layers/yocto-poky/meta-skeleton/recipes-skeleton/useradd/useradd-example/file4
rename to poky/meta-skeleton/recipes-skeleton/useradd/useradd-example/file4
diff --git a/import-layers/yocto-poky/meta-yocto-bsp/README.hardware b/poky/meta-yocto-bsp/README.hardware
similarity index 100%
rename from import-layers/yocto-poky/meta-yocto-bsp/README.hardware
rename to poky/meta-yocto-bsp/README.hardware
diff --git a/import-layers/yocto-poky/meta-yocto-bsp/conf/layer.conf b/poky/meta-yocto-bsp/conf/layer.conf
similarity index 100%
rename from import-layers/yocto-poky/meta-yocto-bsp/conf/layer.conf
rename to poky/meta-yocto-bsp/conf/layer.conf
diff --git a/import-layers/yocto-poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf b/poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf
similarity index 100%
rename from import-layers/yocto-poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf
rename to poky/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf
diff --git a/import-layers/yocto-poky/meta-yocto-bsp/conf/machine/edgerouter.conf b/poky/meta-yocto-bsp/conf/machine/edgerouter.conf
similarity index 100%
rename from import-layers/yocto-poky/meta-yocto-bsp/conf/machine/edgerouter.conf
rename to poky/meta-yocto-bsp/conf/machine/edgerouter.conf
diff --git a/import-layers/yocto-poky/meta-yocto-bsp/conf/machine/genericx86-64.conf b/poky/meta-yocto-bsp/conf/machine/genericx86-64.conf
similarity index 100%
rename from import-layers/yocto-poky/meta-yocto-bsp/conf/machine/genericx86-64.conf
rename to poky/meta-yocto-bsp/conf/machine/genericx86-64.conf
diff --git a/import-layers/yocto-poky/meta-yocto-bsp/conf/machine/genericx86.conf b/poky/meta-yocto-bsp/conf/machine/genericx86.conf
similarity index 100%
rename from import-layers/yocto-poky/meta-yocto-bsp/conf/machine/genericx86.conf
rename to poky/meta-yocto-bsp/conf/machine/genericx86.conf
diff --git a/import-layers/yocto-poky/meta-yocto-bsp/conf/machine/include/genericx86-common.inc b/poky/meta-yocto-bsp/conf/machine/include/genericx86-common.inc
similarity index 100%
rename from import-layers/yocto-poky/meta-yocto-bsp/conf/machine/include/genericx86-common.inc
rename to poky/meta-yocto-bsp/conf/machine/include/genericx86-common.inc
diff --git a/import-layers/yocto-poky/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf b/poky/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf
similarity index 100%
rename from import-layers/yocto-poky/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf
rename to poky/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf
diff --git a/import-layers/yocto-poky/meta-yocto-bsp/lib/oeqa/controllers/__init__.py b/poky/meta-yocto-bsp/lib/oeqa/controllers/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/meta-yocto-bsp/lib/oeqa/controllers/__init__.py
rename to poky/meta-yocto-bsp/lib/oeqa/controllers/__init__.py
diff --git a/import-layers/yocto-poky/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py b/poky/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py
similarity index 100%
rename from import-layers/yocto-poky/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py
rename to poky/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py
diff --git a/import-layers/yocto-poky/meta-yocto-bsp/lib/oeqa/controllers/edgeroutertarget.py b/poky/meta-yocto-bsp/lib/oeqa/controllers/edgeroutertarget.py
similarity index 100%
rename from import-layers/yocto-poky/meta-yocto-bsp/lib/oeqa/controllers/edgeroutertarget.py
rename to poky/meta-yocto-bsp/lib/oeqa/controllers/edgeroutertarget.py
diff --git a/import-layers/yocto-poky/meta-yocto-bsp/lib/oeqa/controllers/grubtarget.py b/poky/meta-yocto-bsp/lib/oeqa/controllers/grubtarget.py
similarity index 100%
rename from import-layers/yocto-poky/meta-yocto-bsp/lib/oeqa/controllers/grubtarget.py
rename to poky/meta-yocto-bsp/lib/oeqa/controllers/grubtarget.py
diff --git a/import-layers/yocto-poky/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py b/poky/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py
similarity index 100%
rename from import-layers/yocto-poky/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py
rename to poky/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py
diff --git a/import-layers/yocto-poky/meta-yocto-bsp/recipes-bsp/formfactor/formfactor/beaglebone-yocto/machconfig b/poky/meta-yocto-bsp/recipes-bsp/formfactor/formfactor/beaglebone-yocto/machconfig
similarity index 100%
rename from import-layers/yocto-poky/meta-yocto-bsp/recipes-bsp/formfactor/formfactor/beaglebone-yocto/machconfig
rename to poky/meta-yocto-bsp/recipes-bsp/formfactor/formfactor/beaglebone-yocto/machconfig
diff --git a/import-layers/yocto-poky/meta-yocto-bsp/recipes-bsp/formfactor/formfactor/genericx86-64/machconfig b/poky/meta-yocto-bsp/recipes-bsp/formfactor/formfactor/genericx86-64/machconfig
similarity index 100%
rename from import-layers/yocto-poky/meta-yocto-bsp/recipes-bsp/formfactor/formfactor/genericx86-64/machconfig
rename to poky/meta-yocto-bsp/recipes-bsp/formfactor/formfactor/genericx86-64/machconfig
diff --git a/import-layers/yocto-poky/meta-yocto-bsp/recipes-bsp/formfactor/formfactor/genericx86/machconfig b/poky/meta-yocto-bsp/recipes-bsp/formfactor/formfactor/genericx86/machconfig
similarity index 100%
rename from import-layers/yocto-poky/meta-yocto-bsp/recipes-bsp/formfactor/formfactor/genericx86/machconfig
rename to poky/meta-yocto-bsp/recipes-bsp/formfactor/formfactor/genericx86/machconfig
diff --git a/import-layers/yocto-poky/meta-yocto-bsp/recipes-bsp/formfactor/formfactor_0.0.bbappend b/poky/meta-yocto-bsp/recipes-bsp/formfactor/formfactor_0.0.bbappend
similarity index 100%
rename from import-layers/yocto-poky/meta-yocto-bsp/recipes-bsp/formfactor/formfactor_0.0.bbappend
rename to poky/meta-yocto-bsp/recipes-bsp/formfactor/formfactor_0.0.bbappend
diff --git a/import-layers/yocto-poky/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.conf b/poky/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.conf
similarity index 100%
rename from import-layers/yocto-poky/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.conf
rename to poky/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.conf
diff --git a/import-layers/yocto-poky/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.sh b/poky/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.sh
similarity index 100%
rename from import-layers/yocto-poky/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.sh
rename to poky/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check/gma500-gfx-check.sh
diff --git a/import-layers/yocto-poky/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check_1.0.bb b/poky/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check_1.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check_1.0.bb
rename to poky/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check_1.0.bb
diff --git a/import-layers/yocto-poky/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/beaglebone-yocto/xorg.conf b/poky/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/beaglebone-yocto/xorg.conf
similarity index 100%
rename from import-layers/yocto-poky/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/beaglebone-yocto/xorg.conf
rename to poky/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/beaglebone-yocto/xorg.conf
diff --git a/import-layers/yocto-poky/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/genericx86-64/xorg.conf b/poky/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/genericx86-64/xorg.conf
similarity index 100%
rename from import-layers/yocto-poky/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/genericx86-64/xorg.conf
rename to poky/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/genericx86-64/xorg.conf
diff --git a/import-layers/yocto-poky/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/genericx86/xorg.conf b/poky/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/genericx86/xorg.conf
similarity index 100%
rename from import-layers/yocto-poky/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/genericx86/xorg.conf
rename to poky/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/genericx86/xorg.conf
diff --git a/import-layers/yocto-poky/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/poky/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
similarity index 100%
rename from import-layers/yocto-poky/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
rename to poky/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
diff --git a/import-layers/yocto-poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.12.bbappend b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.12.bbappend
similarity index 100%
rename from import-layers/yocto-poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.12.bbappend
rename to poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.12.bbappend
diff --git a/import-layers/yocto-poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.14.bbappend b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.14.bbappend
similarity index 100%
rename from import-layers/yocto-poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.14.bbappend
rename to poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.14.bbappend
diff --git a/import-layers/yocto-poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.15.bbappend b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.15.bbappend
similarity index 100%
rename from import-layers/yocto-poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.15.bbappend
rename to poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_4.15.bbappend
diff --git a/import-layers/yocto-poky/meta-yocto-bsp/wic/beaglebone-yocto.wks b/poky/meta-yocto-bsp/wic/beaglebone-yocto.wks
similarity index 100%
rename from import-layers/yocto-poky/meta-yocto-bsp/wic/beaglebone-yocto.wks
rename to poky/meta-yocto-bsp/wic/beaglebone-yocto.wks
diff --git a/import-layers/yocto-poky/meta-yocto-bsp/wic/edgerouter.wks b/poky/meta-yocto-bsp/wic/edgerouter.wks
similarity index 100%
rename from import-layers/yocto-poky/meta-yocto-bsp/wic/edgerouter.wks
rename to poky/meta-yocto-bsp/wic/edgerouter.wks
diff --git a/import-layers/yocto-poky/meta-yocto-bsp/wic/genericx86.wks b/poky/meta-yocto-bsp/wic/genericx86.wks
similarity index 100%
rename from import-layers/yocto-poky/meta-yocto-bsp/wic/genericx86.wks
rename to poky/meta-yocto-bsp/wic/genericx86.wks
diff --git a/import-layers/yocto-poky/meta-yocto-bsp/wic/mpc8315e-rdb.wks b/poky/meta-yocto-bsp/wic/mpc8315e-rdb.wks
similarity index 100%
rename from import-layers/yocto-poky/meta-yocto-bsp/wic/mpc8315e-rdb.wks
rename to poky/meta-yocto-bsp/wic/mpc8315e-rdb.wks
diff --git a/import-layers/yocto-poky/meta/COPYING.GPLv2 b/poky/meta/COPYING.GPLv2
similarity index 100%
rename from import-layers/yocto-poky/meta/COPYING.GPLv2
rename to poky/meta/COPYING.GPLv2
diff --git a/import-layers/yocto-poky/meta/COPYING.MIT b/poky/meta/COPYING.MIT
similarity index 100%
rename from import-layers/yocto-poky/meta/COPYING.MIT
rename to poky/meta/COPYING.MIT
diff --git a/import-layers/yocto-poky/meta/classes/allarch.bbclass b/poky/meta/classes/allarch.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/allarch.bbclass
rename to poky/meta/classes/allarch.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/archiver.bbclass b/poky/meta/classes/archiver.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/archiver.bbclass
rename to poky/meta/classes/archiver.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/autotools-brokensep.bbclass b/poky/meta/classes/autotools-brokensep.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/autotools-brokensep.bbclass
rename to poky/meta/classes/autotools-brokensep.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/autotools.bbclass b/poky/meta/classes/autotools.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/autotools.bbclass
rename to poky/meta/classes/autotools.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/base.bbclass b/poky/meta/classes/base.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/base.bbclass
rename to poky/meta/classes/base.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/bash-completion.bbclass b/poky/meta/classes/bash-completion.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/bash-completion.bbclass
rename to poky/meta/classes/bash-completion.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/bin_package.bbclass b/poky/meta/classes/bin_package.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/bin_package.bbclass
rename to poky/meta/classes/bin_package.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/binconfig-disabled.bbclass b/poky/meta/classes/binconfig-disabled.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/binconfig-disabled.bbclass
rename to poky/meta/classes/binconfig-disabled.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/binconfig.bbclass b/poky/meta/classes/binconfig.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/binconfig.bbclass
rename to poky/meta/classes/binconfig.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/blacklist.bbclass b/poky/meta/classes/blacklist.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/blacklist.bbclass
rename to poky/meta/classes/blacklist.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/bluetooth.bbclass b/poky/meta/classes/bluetooth.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/bluetooth.bbclass
rename to poky/meta/classes/bluetooth.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/bugzilla.bbclass b/poky/meta/classes/bugzilla.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/bugzilla.bbclass
rename to poky/meta/classes/bugzilla.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/buildhistory.bbclass b/poky/meta/classes/buildhistory.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/buildhistory.bbclass
rename to poky/meta/classes/buildhistory.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/buildstats-summary.bbclass b/poky/meta/classes/buildstats-summary.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/buildstats-summary.bbclass
rename to poky/meta/classes/buildstats-summary.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/buildstats.bbclass b/poky/meta/classes/buildstats.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/buildstats.bbclass
rename to poky/meta/classes/buildstats.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/ccache.bbclass b/poky/meta/classes/ccache.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/ccache.bbclass
rename to poky/meta/classes/ccache.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/chrpath.bbclass b/poky/meta/classes/chrpath.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/chrpath.bbclass
rename to poky/meta/classes/chrpath.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/clutter.bbclass b/poky/meta/classes/clutter.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/clutter.bbclass
rename to poky/meta/classes/clutter.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/cmake.bbclass b/poky/meta/classes/cmake.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/cmake.bbclass
rename to poky/meta/classes/cmake.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/cml1.bbclass b/poky/meta/classes/cml1.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/cml1.bbclass
rename to poky/meta/classes/cml1.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/compress_doc.bbclass b/poky/meta/classes/compress_doc.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/compress_doc.bbclass
rename to poky/meta/classes/compress_doc.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/copyleft_compliance.bbclass b/poky/meta/classes/copyleft_compliance.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/copyleft_compliance.bbclass
rename to poky/meta/classes/copyleft_compliance.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/copyleft_filter.bbclass b/poky/meta/classes/copyleft_filter.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/copyleft_filter.bbclass
rename to poky/meta/classes/copyleft_filter.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/core-image.bbclass b/poky/meta/classes/core-image.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/core-image.bbclass
rename to poky/meta/classes/core-image.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/cpan-base.bbclass b/poky/meta/classes/cpan-base.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/cpan-base.bbclass
rename to poky/meta/classes/cpan-base.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/cpan.bbclass b/poky/meta/classes/cpan.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/cpan.bbclass
rename to poky/meta/classes/cpan.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/cpan_build.bbclass b/poky/meta/classes/cpan_build.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/cpan_build.bbclass
rename to poky/meta/classes/cpan_build.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/cross-canadian.bbclass b/poky/meta/classes/cross-canadian.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/cross-canadian.bbclass
rename to poky/meta/classes/cross-canadian.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/cross.bbclass b/poky/meta/classes/cross.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/cross.bbclass
rename to poky/meta/classes/cross.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/crosssdk.bbclass b/poky/meta/classes/crosssdk.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/crosssdk.bbclass
rename to poky/meta/classes/crosssdk.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/cve-check.bbclass b/poky/meta/classes/cve-check.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/cve-check.bbclass
rename to poky/meta/classes/cve-check.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/debian.bbclass b/poky/meta/classes/debian.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/debian.bbclass
rename to poky/meta/classes/debian.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/deploy.bbclass b/poky/meta/classes/deploy.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/deploy.bbclass
rename to poky/meta/classes/deploy.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/devshell.bbclass b/poky/meta/classes/devshell.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/devshell.bbclass
rename to poky/meta/classes/devshell.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/devtool-source.bbclass b/poky/meta/classes/devtool-source.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/devtool-source.bbclass
rename to poky/meta/classes/devtool-source.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/devupstream.bbclass b/poky/meta/classes/devupstream.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/devupstream.bbclass
rename to poky/meta/classes/devupstream.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/distro_features_check.bbclass b/poky/meta/classes/distro_features_check.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/distro_features_check.bbclass
rename to poky/meta/classes/distro_features_check.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/distrodata.bbclass b/poky/meta/classes/distrodata.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/distrodata.bbclass
rename to poky/meta/classes/distrodata.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/distrooverrides.bbclass b/poky/meta/classes/distrooverrides.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/distrooverrides.bbclass
rename to poky/meta/classes/distrooverrides.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/distutils-base.bbclass b/poky/meta/classes/distutils-base.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/distutils-base.bbclass
rename to poky/meta/classes/distutils-base.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/distutils-common-base.bbclass b/poky/meta/classes/distutils-common-base.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/distutils-common-base.bbclass
rename to poky/meta/classes/distutils-common-base.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/distutils-tools.bbclass b/poky/meta/classes/distutils-tools.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/distutils-tools.bbclass
rename to poky/meta/classes/distutils-tools.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/distutils.bbclass b/poky/meta/classes/distutils.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/distutils.bbclass
rename to poky/meta/classes/distutils.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/distutils3-base.bbclass b/poky/meta/classes/distutils3-base.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/distutils3-base.bbclass
rename to poky/meta/classes/distutils3-base.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/distutils3.bbclass b/poky/meta/classes/distutils3.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/distutils3.bbclass
rename to poky/meta/classes/distutils3.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/externalsrc.bbclass b/poky/meta/classes/externalsrc.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/externalsrc.bbclass
rename to poky/meta/classes/externalsrc.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/extrausers.bbclass b/poky/meta/classes/extrausers.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/extrausers.bbclass
rename to poky/meta/classes/extrausers.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/fontcache.bbclass b/poky/meta/classes/fontcache.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/fontcache.bbclass
rename to poky/meta/classes/fontcache.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/fs-uuid.bbclass b/poky/meta/classes/fs-uuid.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/fs-uuid.bbclass
rename to poky/meta/classes/fs-uuid.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/gconf.bbclass b/poky/meta/classes/gconf.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/gconf.bbclass
rename to poky/meta/classes/gconf.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/gettext.bbclass b/poky/meta/classes/gettext.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/gettext.bbclass
rename to poky/meta/classes/gettext.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/gio-module-cache.bbclass b/poky/meta/classes/gio-module-cache.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/gio-module-cache.bbclass
rename to poky/meta/classes/gio-module-cache.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/glide.bbclass b/poky/meta/classes/glide.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/glide.bbclass
rename to poky/meta/classes/glide.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/gnome.bbclass b/poky/meta/classes/gnome.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/gnome.bbclass
rename to poky/meta/classes/gnome.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/gnomebase.bbclass b/poky/meta/classes/gnomebase.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/gnomebase.bbclass
rename to poky/meta/classes/gnomebase.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/go.bbclass b/poky/meta/classes/go.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/go.bbclass
rename to poky/meta/classes/go.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/goarch.bbclass b/poky/meta/classes/goarch.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/goarch.bbclass
rename to poky/meta/classes/goarch.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/gobject-introspection-data.bbclass b/poky/meta/classes/gobject-introspection-data.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/gobject-introspection-data.bbclass
rename to poky/meta/classes/gobject-introspection-data.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/gobject-introspection.bbclass b/poky/meta/classes/gobject-introspection.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/gobject-introspection.bbclass
rename to poky/meta/classes/gobject-introspection.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/godep.bbclass b/poky/meta/classes/godep.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/godep.bbclass
rename to poky/meta/classes/godep.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/grub-efi-cfg.bbclass b/poky/meta/classes/grub-efi-cfg.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/grub-efi-cfg.bbclass
rename to poky/meta/classes/grub-efi-cfg.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/grub-efi.bbclass b/poky/meta/classes/grub-efi.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/grub-efi.bbclass
rename to poky/meta/classes/grub-efi.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/gsettings.bbclass b/poky/meta/classes/gsettings.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/gsettings.bbclass
rename to poky/meta/classes/gsettings.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/gtk-doc.bbclass b/poky/meta/classes/gtk-doc.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/gtk-doc.bbclass
rename to poky/meta/classes/gtk-doc.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/gtk-icon-cache.bbclass b/poky/meta/classes/gtk-icon-cache.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/gtk-icon-cache.bbclass
rename to poky/meta/classes/gtk-icon-cache.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/gtk-immodules-cache.bbclass b/poky/meta/classes/gtk-immodules-cache.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/gtk-immodules-cache.bbclass
rename to poky/meta/classes/gtk-immodules-cache.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/icecc.bbclass b/poky/meta/classes/icecc.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/icecc.bbclass
rename to poky/meta/classes/icecc.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/image-buildinfo.bbclass b/poky/meta/classes/image-buildinfo.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/image-buildinfo.bbclass
rename to poky/meta/classes/image-buildinfo.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/image-combined-dbg.bbclass b/poky/meta/classes/image-combined-dbg.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/image-combined-dbg.bbclass
rename to poky/meta/classes/image-combined-dbg.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/image-container.bbclass b/poky/meta/classes/image-container.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/image-container.bbclass
rename to poky/meta/classes/image-container.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/image-live.bbclass b/poky/meta/classes/image-live.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/image-live.bbclass
rename to poky/meta/classes/image-live.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/image-mklibs.bbclass b/poky/meta/classes/image-mklibs.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/image-mklibs.bbclass
rename to poky/meta/classes/image-mklibs.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/image-prelink.bbclass b/poky/meta/classes/image-prelink.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/image-prelink.bbclass
rename to poky/meta/classes/image-prelink.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/image.bbclass b/poky/meta/classes/image.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/image.bbclass
rename to poky/meta/classes/image.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/image_types.bbclass b/poky/meta/classes/image_types.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/image_types.bbclass
rename to poky/meta/classes/image_types.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/image_types_wic.bbclass b/poky/meta/classes/image_types_wic.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/image_types_wic.bbclass
rename to poky/meta/classes/image_types_wic.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/insane.bbclass b/poky/meta/classes/insane.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/insane.bbclass
rename to poky/meta/classes/insane.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/kernel-arch.bbclass b/poky/meta/classes/kernel-arch.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/kernel-arch.bbclass
rename to poky/meta/classes/kernel-arch.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/kernel-devicetree.bbclass b/poky/meta/classes/kernel-devicetree.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/kernel-devicetree.bbclass
rename to poky/meta/classes/kernel-devicetree.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/kernel-fitimage.bbclass b/poky/meta/classes/kernel-fitimage.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/kernel-fitimage.bbclass
rename to poky/meta/classes/kernel-fitimage.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/kernel-grub.bbclass b/poky/meta/classes/kernel-grub.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/kernel-grub.bbclass
rename to poky/meta/classes/kernel-grub.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/kernel-module-split.bbclass b/poky/meta/classes/kernel-module-split.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/kernel-module-split.bbclass
rename to poky/meta/classes/kernel-module-split.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/kernel-uboot.bbclass b/poky/meta/classes/kernel-uboot.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/kernel-uboot.bbclass
rename to poky/meta/classes/kernel-uboot.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/kernel-uimage.bbclass b/poky/meta/classes/kernel-uimage.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/kernel-uimage.bbclass
rename to poky/meta/classes/kernel-uimage.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/kernel-yocto.bbclass b/poky/meta/classes/kernel-yocto.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/kernel-yocto.bbclass
rename to poky/meta/classes/kernel-yocto.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/kernel.bbclass b/poky/meta/classes/kernel.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/kernel.bbclass
rename to poky/meta/classes/kernel.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/kernelsrc.bbclass b/poky/meta/classes/kernelsrc.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/kernelsrc.bbclass
rename to poky/meta/classes/kernelsrc.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/lib_package.bbclass b/poky/meta/classes/lib_package.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/lib_package.bbclass
rename to poky/meta/classes/lib_package.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/libc-common.bbclass b/poky/meta/classes/libc-common.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/libc-common.bbclass
rename to poky/meta/classes/libc-common.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/libc-package.bbclass b/poky/meta/classes/libc-package.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/libc-package.bbclass
rename to poky/meta/classes/libc-package.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/license.bbclass b/poky/meta/classes/license.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/license.bbclass
rename to poky/meta/classes/license.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/linux-kernel-base.bbclass b/poky/meta/classes/linux-kernel-base.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/linux-kernel-base.bbclass
rename to poky/meta/classes/linux-kernel-base.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/linuxloader.bbclass b/poky/meta/classes/linuxloader.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/linuxloader.bbclass
rename to poky/meta/classes/linuxloader.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/live-vm-common.bbclass b/poky/meta/classes/live-vm-common.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/live-vm-common.bbclass
rename to poky/meta/classes/live-vm-common.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/logging.bbclass b/poky/meta/classes/logging.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/logging.bbclass
rename to poky/meta/classes/logging.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/manpages.bbclass b/poky/meta/classes/manpages.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/manpages.bbclass
rename to poky/meta/classes/manpages.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/meson.bbclass b/poky/meta/classes/meson.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/meson.bbclass
rename to poky/meta/classes/meson.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/meta.bbclass b/poky/meta/classes/meta.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/meta.bbclass
rename to poky/meta/classes/meta.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/metadata_scm.bbclass b/poky/meta/classes/metadata_scm.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/metadata_scm.bbclass
rename to poky/meta/classes/metadata_scm.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/migrate_localcount.bbclass b/poky/meta/classes/migrate_localcount.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/migrate_localcount.bbclass
rename to poky/meta/classes/migrate_localcount.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/mime.bbclass b/poky/meta/classes/mime.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/mime.bbclass
rename to poky/meta/classes/mime.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/mirrors.bbclass b/poky/meta/classes/mirrors.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/mirrors.bbclass
rename to poky/meta/classes/mirrors.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/module-base.bbclass b/poky/meta/classes/module-base.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/module-base.bbclass
rename to poky/meta/classes/module-base.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/module.bbclass b/poky/meta/classes/module.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/module.bbclass
rename to poky/meta/classes/module.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/multilib.bbclass b/poky/meta/classes/multilib.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/multilib.bbclass
rename to poky/meta/classes/multilib.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/multilib_global.bbclass b/poky/meta/classes/multilib_global.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/multilib_global.bbclass
rename to poky/meta/classes/multilib_global.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/multilib_header.bbclass b/poky/meta/classes/multilib_header.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/multilib_header.bbclass
rename to poky/meta/classes/multilib_header.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/native.bbclass b/poky/meta/classes/native.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/native.bbclass
rename to poky/meta/classes/native.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/nativesdk.bbclass b/poky/meta/classes/nativesdk.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/nativesdk.bbclass
rename to poky/meta/classes/nativesdk.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/nopackages.bbclass b/poky/meta/classes/nopackages.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/nopackages.bbclass
rename to poky/meta/classes/nopackages.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/npm.bbclass b/poky/meta/classes/npm.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/npm.bbclass
rename to poky/meta/classes/npm.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/oelint.bbclass b/poky/meta/classes/oelint.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/oelint.bbclass
rename to poky/meta/classes/oelint.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/own-mirrors.bbclass b/poky/meta/classes/own-mirrors.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/own-mirrors.bbclass
rename to poky/meta/classes/own-mirrors.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/package.bbclass b/poky/meta/classes/package.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/package.bbclass
rename to poky/meta/classes/package.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/package_deb.bbclass b/poky/meta/classes/package_deb.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/package_deb.bbclass
rename to poky/meta/classes/package_deb.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/package_ipk.bbclass b/poky/meta/classes/package_ipk.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/package_ipk.bbclass
rename to poky/meta/classes/package_ipk.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/package_rpm.bbclass b/poky/meta/classes/package_rpm.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/package_rpm.bbclass
rename to poky/meta/classes/package_rpm.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/package_tar.bbclass b/poky/meta/classes/package_tar.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/package_tar.bbclass
rename to poky/meta/classes/package_tar.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/packagedata.bbclass b/poky/meta/classes/packagedata.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/packagedata.bbclass
rename to poky/meta/classes/packagedata.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/packagefeed-stability.bbclass b/poky/meta/classes/packagefeed-stability.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/packagefeed-stability.bbclass
rename to poky/meta/classes/packagefeed-stability.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/packagegroup.bbclass b/poky/meta/classes/packagegroup.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/packagegroup.bbclass
rename to poky/meta/classes/packagegroup.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/patch.bbclass b/poky/meta/classes/patch.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/patch.bbclass
rename to poky/meta/classes/patch.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/perl-version.bbclass b/poky/meta/classes/perl-version.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/perl-version.bbclass
rename to poky/meta/classes/perl-version.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/perlnative.bbclass b/poky/meta/classes/perlnative.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/perlnative.bbclass
rename to poky/meta/classes/perlnative.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/pixbufcache.bbclass b/poky/meta/classes/pixbufcache.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/pixbufcache.bbclass
rename to poky/meta/classes/pixbufcache.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/pkgconfig.bbclass b/poky/meta/classes/pkgconfig.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/pkgconfig.bbclass
rename to poky/meta/classes/pkgconfig.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/populate_sdk.bbclass b/poky/meta/classes/populate_sdk.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/populate_sdk.bbclass
rename to poky/meta/classes/populate_sdk.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/populate_sdk_base.bbclass b/poky/meta/classes/populate_sdk_base.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/populate_sdk_base.bbclass
rename to poky/meta/classes/populate_sdk_base.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/populate_sdk_ext.bbclass b/poky/meta/classes/populate_sdk_ext.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/populate_sdk_ext.bbclass
rename to poky/meta/classes/populate_sdk_ext.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/prexport.bbclass b/poky/meta/classes/prexport.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/prexport.bbclass
rename to poky/meta/classes/prexport.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/primport.bbclass b/poky/meta/classes/primport.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/primport.bbclass
rename to poky/meta/classes/primport.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/ptest-gnome.bbclass b/poky/meta/classes/ptest-gnome.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/ptest-gnome.bbclass
rename to poky/meta/classes/ptest-gnome.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/ptest-perl.bbclass b/poky/meta/classes/ptest-perl.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/ptest-perl.bbclass
rename to poky/meta/classes/ptest-perl.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/ptest.bbclass b/poky/meta/classes/ptest.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/ptest.bbclass
rename to poky/meta/classes/ptest.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/pypi.bbclass b/poky/meta/classes/pypi.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/pypi.bbclass
rename to poky/meta/classes/pypi.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/python-dir.bbclass b/poky/meta/classes/python-dir.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/python-dir.bbclass
rename to poky/meta/classes/python-dir.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/python3-dir.bbclass b/poky/meta/classes/python3-dir.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/python3-dir.bbclass
rename to poky/meta/classes/python3-dir.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/python3native.bbclass b/poky/meta/classes/python3native.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/python3native.bbclass
rename to poky/meta/classes/python3native.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/pythonnative.bbclass b/poky/meta/classes/pythonnative.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/pythonnative.bbclass
rename to poky/meta/classes/pythonnative.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/qemu.bbclass b/poky/meta/classes/qemu.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/qemu.bbclass
rename to poky/meta/classes/qemu.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/qemuboot.bbclass b/poky/meta/classes/qemuboot.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/qemuboot.bbclass
rename to poky/meta/classes/qemuboot.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/recipe_sanity.bbclass b/poky/meta/classes/recipe_sanity.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/recipe_sanity.bbclass
rename to poky/meta/classes/recipe_sanity.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/relative_symlinks.bbclass b/poky/meta/classes/relative_symlinks.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/relative_symlinks.bbclass
rename to poky/meta/classes/relative_symlinks.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/relocatable.bbclass b/poky/meta/classes/relocatable.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/relocatable.bbclass
rename to poky/meta/classes/relocatable.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/remove-libtool.bbclass b/poky/meta/classes/remove-libtool.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/remove-libtool.bbclass
rename to poky/meta/classes/remove-libtool.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/report-error.bbclass b/poky/meta/classes/report-error.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/report-error.bbclass
rename to poky/meta/classes/report-error.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/reproducible_build.bbclass b/poky/meta/classes/reproducible_build.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/reproducible_build.bbclass
rename to poky/meta/classes/reproducible_build.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/reproducible_build_simple.bbclass b/poky/meta/classes/reproducible_build_simple.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/reproducible_build_simple.bbclass
rename to poky/meta/classes/reproducible_build_simple.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/rm_work.bbclass b/poky/meta/classes/rm_work.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/rm_work.bbclass
rename to poky/meta/classes/rm_work.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/rm_work_and_downloads.bbclass b/poky/meta/classes/rm_work_and_downloads.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/rm_work_and_downloads.bbclass
rename to poky/meta/classes/rm_work_and_downloads.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/rootfs-postcommands.bbclass b/poky/meta/classes/rootfs-postcommands.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/rootfs-postcommands.bbclass
rename to poky/meta/classes/rootfs-postcommands.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/rootfs_deb.bbclass b/poky/meta/classes/rootfs_deb.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/rootfs_deb.bbclass
rename to poky/meta/classes/rootfs_deb.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/rootfs_ipk.bbclass b/poky/meta/classes/rootfs_ipk.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/rootfs_ipk.bbclass
rename to poky/meta/classes/rootfs_ipk.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/rootfs_rpm.bbclass b/poky/meta/classes/rootfs_rpm.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/rootfs_rpm.bbclass
rename to poky/meta/classes/rootfs_rpm.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/rootfsdebugfiles.bbclass b/poky/meta/classes/rootfsdebugfiles.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/rootfsdebugfiles.bbclass
rename to poky/meta/classes/rootfsdebugfiles.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/sanity.bbclass b/poky/meta/classes/sanity.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/sanity.bbclass
rename to poky/meta/classes/sanity.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/scons.bbclass b/poky/meta/classes/scons.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/scons.bbclass
rename to poky/meta/classes/scons.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/setuptools.bbclass b/poky/meta/classes/setuptools.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/setuptools.bbclass
rename to poky/meta/classes/setuptools.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/setuptools3.bbclass b/poky/meta/classes/setuptools3.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/setuptools3.bbclass
rename to poky/meta/classes/setuptools3.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/sign_ipk.bbclass b/poky/meta/classes/sign_ipk.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/sign_ipk.bbclass
rename to poky/meta/classes/sign_ipk.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/sign_package_feed.bbclass b/poky/meta/classes/sign_package_feed.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/sign_package_feed.bbclass
rename to poky/meta/classes/sign_package_feed.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/sign_rpm.bbclass b/poky/meta/classes/sign_rpm.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/sign_rpm.bbclass
rename to poky/meta/classes/sign_rpm.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/siteconfig.bbclass b/poky/meta/classes/siteconfig.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/siteconfig.bbclass
rename to poky/meta/classes/siteconfig.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/siteinfo.bbclass b/poky/meta/classes/siteinfo.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/siteinfo.bbclass
rename to poky/meta/classes/siteinfo.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/spdx.bbclass b/poky/meta/classes/spdx.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/spdx.bbclass
rename to poky/meta/classes/spdx.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/sstate.bbclass b/poky/meta/classes/sstate.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/sstate.bbclass
rename to poky/meta/classes/sstate.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/staging.bbclass b/poky/meta/classes/staging.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/staging.bbclass
rename to poky/meta/classes/staging.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/syslinux.bbclass b/poky/meta/classes/syslinux.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/syslinux.bbclass
rename to poky/meta/classes/syslinux.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/systemd-boot-cfg.bbclass b/poky/meta/classes/systemd-boot-cfg.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/systemd-boot-cfg.bbclass
rename to poky/meta/classes/systemd-boot-cfg.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/systemd-boot.bbclass b/poky/meta/classes/systemd-boot.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/systemd-boot.bbclass
rename to poky/meta/classes/systemd-boot.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/systemd.bbclass b/poky/meta/classes/systemd.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/systemd.bbclass
rename to poky/meta/classes/systemd.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/terminal.bbclass b/poky/meta/classes/terminal.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/terminal.bbclass
rename to poky/meta/classes/terminal.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/testexport.bbclass b/poky/meta/classes/testexport.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/testexport.bbclass
rename to poky/meta/classes/testexport.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/testimage-auto.bbclass b/poky/meta/classes/testimage-auto.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/testimage-auto.bbclass
rename to poky/meta/classes/testimage-auto.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/testimage.bbclass b/poky/meta/classes/testimage.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/testimage.bbclass
rename to poky/meta/classes/testimage.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/testsdk.bbclass b/poky/meta/classes/testsdk.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/testsdk.bbclass
rename to poky/meta/classes/testsdk.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/texinfo.bbclass b/poky/meta/classes/texinfo.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/texinfo.bbclass
rename to poky/meta/classes/texinfo.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/tinderclient.bbclass b/poky/meta/classes/tinderclient.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/tinderclient.bbclass
rename to poky/meta/classes/tinderclient.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/toaster.bbclass b/poky/meta/classes/toaster.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/toaster.bbclass
rename to poky/meta/classes/toaster.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/toolchain-scripts-base.bbclass b/poky/meta/classes/toolchain-scripts-base.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/toolchain-scripts-base.bbclass
rename to poky/meta/classes/toolchain-scripts-base.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/toolchain-scripts.bbclass b/poky/meta/classes/toolchain-scripts.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/toolchain-scripts.bbclass
rename to poky/meta/classes/toolchain-scripts.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/typecheck.bbclass b/poky/meta/classes/typecheck.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/typecheck.bbclass
rename to poky/meta/classes/typecheck.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/uboot-config.bbclass b/poky/meta/classes/uboot-config.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/uboot-config.bbclass
rename to poky/meta/classes/uboot-config.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/uboot-extlinux-config.bbclass b/poky/meta/classes/uboot-extlinux-config.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/uboot-extlinux-config.bbclass
rename to poky/meta/classes/uboot-extlinux-config.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/uboot-sign.bbclass b/poky/meta/classes/uboot-sign.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/uboot-sign.bbclass
rename to poky/meta/classes/uboot-sign.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/uninative.bbclass b/poky/meta/classes/uninative.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/uninative.bbclass
rename to poky/meta/classes/uninative.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/update-alternatives.bbclass b/poky/meta/classes/update-alternatives.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/update-alternatives.bbclass
rename to poky/meta/classes/update-alternatives.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/update-rc.d.bbclass b/poky/meta/classes/update-rc.d.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/update-rc.d.bbclass
rename to poky/meta/classes/update-rc.d.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/upstream-version-is-even.bbclass b/poky/meta/classes/upstream-version-is-even.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/upstream-version-is-even.bbclass
rename to poky/meta/classes/upstream-version-is-even.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/useradd-staticids.bbclass b/poky/meta/classes/useradd-staticids.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/useradd-staticids.bbclass
rename to poky/meta/classes/useradd-staticids.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/useradd.bbclass b/poky/meta/classes/useradd.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/useradd.bbclass
rename to poky/meta/classes/useradd.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/useradd_base.bbclass b/poky/meta/classes/useradd_base.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/useradd_base.bbclass
rename to poky/meta/classes/useradd_base.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/utility-tasks.bbclass b/poky/meta/classes/utility-tasks.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/utility-tasks.bbclass
rename to poky/meta/classes/utility-tasks.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/utils.bbclass b/poky/meta/classes/utils.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/utils.bbclass
rename to poky/meta/classes/utils.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/vala.bbclass b/poky/meta/classes/vala.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/vala.bbclass
rename to poky/meta/classes/vala.bbclass
diff --git a/import-layers/yocto-poky/meta/classes/waf.bbclass b/poky/meta/classes/waf.bbclass
similarity index 100%
rename from import-layers/yocto-poky/meta/classes/waf.bbclass
rename to poky/meta/classes/waf.bbclass
diff --git a/import-layers/yocto-poky/meta/conf/abi_version.conf b/poky/meta/conf/abi_version.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/abi_version.conf
rename to poky/meta/conf/abi_version.conf
diff --git a/import-layers/yocto-poky/meta/conf/bitbake.conf b/poky/meta/conf/bitbake.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/bitbake.conf
rename to poky/meta/conf/bitbake.conf
diff --git a/import-layers/yocto-poky/meta/conf/conf-notes.txt b/poky/meta/conf/conf-notes.txt
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/conf-notes.txt
rename to poky/meta/conf/conf-notes.txt
diff --git a/import-layers/yocto-poky/meta/conf/distro/defaultsetup.conf b/poky/meta/conf/distro/defaultsetup.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/distro/defaultsetup.conf
rename to poky/meta/conf/distro/defaultsetup.conf
diff --git a/import-layers/yocto-poky/meta/conf/distro/include/as-needed.inc b/poky/meta/conf/distro/include/as-needed.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/distro/include/as-needed.inc
rename to poky/meta/conf/distro/include/as-needed.inc
diff --git a/import-layers/yocto-poky/meta/conf/distro/include/default-distrovars.inc b/poky/meta/conf/distro/include/default-distrovars.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/distro/include/default-distrovars.inc
rename to poky/meta/conf/distro/include/default-distrovars.inc
diff --git a/import-layers/yocto-poky/meta/conf/distro/include/default-providers.inc b/poky/meta/conf/distro/include/default-providers.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/distro/include/default-providers.inc
rename to poky/meta/conf/distro/include/default-providers.inc
diff --git a/import-layers/yocto-poky/meta/conf/distro/include/default-versions.inc b/poky/meta/conf/distro/include/default-versions.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/distro/include/default-versions.inc
rename to poky/meta/conf/distro/include/default-versions.inc
diff --git a/import-layers/yocto-poky/meta/conf/distro/include/distro_alias.inc b/poky/meta/conf/distro/include/distro_alias.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/distro/include/distro_alias.inc
rename to poky/meta/conf/distro/include/distro_alias.inc
diff --git a/import-layers/yocto-poky/meta/conf/distro/include/maintainers.inc b/poky/meta/conf/distro/include/maintainers.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/distro/include/maintainers.inc
rename to poky/meta/conf/distro/include/maintainers.inc
diff --git a/import-layers/yocto-poky/meta/conf/distro/include/no-static-libs.inc b/poky/meta/conf/distro/include/no-static-libs.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/distro/include/no-static-libs.inc
rename to poky/meta/conf/distro/include/no-static-libs.inc
diff --git a/import-layers/yocto-poky/meta/conf/distro/include/security_flags.inc b/poky/meta/conf/distro/include/security_flags.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/distro/include/security_flags.inc
rename to poky/meta/conf/distro/include/security_flags.inc
diff --git a/import-layers/yocto-poky/meta/conf/distro/include/tclibc-baremetal.inc b/poky/meta/conf/distro/include/tclibc-baremetal.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/distro/include/tclibc-baremetal.inc
rename to poky/meta/conf/distro/include/tclibc-baremetal.inc
diff --git a/import-layers/yocto-poky/meta/conf/distro/include/tclibc-glibc.inc b/poky/meta/conf/distro/include/tclibc-glibc.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/distro/include/tclibc-glibc.inc
rename to poky/meta/conf/distro/include/tclibc-glibc.inc
diff --git a/import-layers/yocto-poky/meta/conf/distro/include/tclibc-musl.inc b/poky/meta/conf/distro/include/tclibc-musl.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/distro/include/tclibc-musl.inc
rename to poky/meta/conf/distro/include/tclibc-musl.inc
diff --git a/import-layers/yocto-poky/meta/conf/distro/include/tcmode-default.inc b/poky/meta/conf/distro/include/tcmode-default.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/distro/include/tcmode-default.inc
rename to poky/meta/conf/distro/include/tcmode-default.inc
diff --git a/import-layers/yocto-poky/meta/conf/distro/include/uninative-flags.inc b/poky/meta/conf/distro/include/uninative-flags.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/distro/include/uninative-flags.inc
rename to poky/meta/conf/distro/include/uninative-flags.inc
diff --git a/import-layers/yocto-poky/meta/conf/distro/include/upstream_tracking.inc b/poky/meta/conf/distro/include/upstream_tracking.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/distro/include/upstream_tracking.inc
rename to poky/meta/conf/distro/include/upstream_tracking.inc
diff --git a/import-layers/yocto-poky/meta/conf/distro/include/world-broken.inc b/poky/meta/conf/distro/include/world-broken.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/distro/include/world-broken.inc
rename to poky/meta/conf/distro/include/world-broken.inc
diff --git a/import-layers/yocto-poky/meta/conf/distro/include/yocto-uninative.inc b/poky/meta/conf/distro/include/yocto-uninative.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/distro/include/yocto-uninative.inc
rename to poky/meta/conf/distro/include/yocto-uninative.inc
diff --git a/import-layers/yocto-poky/meta/conf/documentation.conf b/poky/meta/conf/documentation.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/documentation.conf
rename to poky/meta/conf/documentation.conf
diff --git a/import-layers/yocto-poky/meta/conf/layer.conf b/poky/meta/conf/layer.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/layer.conf
rename to poky/meta/conf/layer.conf
diff --git a/import-layers/yocto-poky/meta/conf/licenses.conf b/poky/meta/conf/licenses.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/licenses.conf
rename to poky/meta/conf/licenses.conf
diff --git a/import-layers/yocto-poky/meta/conf/machine-sdk/i586.conf b/poky/meta/conf/machine-sdk/i586.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine-sdk/i586.conf
rename to poky/meta/conf/machine-sdk/i586.conf
diff --git a/import-layers/yocto-poky/meta/conf/machine-sdk/i686.conf b/poky/meta/conf/machine-sdk/i686.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine-sdk/i686.conf
rename to poky/meta/conf/machine-sdk/i686.conf
diff --git a/import-layers/yocto-poky/meta/conf/machine-sdk/x86_64.conf b/poky/meta/conf/machine-sdk/x86_64.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine-sdk/x86_64.conf
rename to poky/meta/conf/machine-sdk/x86_64.conf
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/README b/poky/meta/conf/machine/include/README
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/README
rename to poky/meta/conf/machine/include/README
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/arm/README b/poky/meta/conf/machine/include/arm/README
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/arm/README
rename to poky/meta/conf/machine/include/arm/README
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/arm/arch-arm.inc b/poky/meta/conf/machine/include/arm/arch-arm.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/arm/arch-arm.inc
rename to poky/meta/conf/machine/include/arm/arch-arm.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/arm/arch-arm64.inc b/poky/meta/conf/machine/include/arm/arch-arm64.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/arm/arch-arm64.inc
rename to poky/meta/conf/machine/include/arm/arch-arm64.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/arm/arch-armv4.inc b/poky/meta/conf/machine/include/arm/arch-armv4.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/arm/arch-armv4.inc
rename to poky/meta/conf/machine/include/arm/arch-armv4.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/arm/arch-armv5-dsp.inc b/poky/meta/conf/machine/include/arm/arch-armv5-dsp.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/arm/arch-armv5-dsp.inc
rename to poky/meta/conf/machine/include/arm/arch-armv5-dsp.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/arm/arch-armv5.inc b/poky/meta/conf/machine/include/arm/arch-armv5.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/arm/arch-armv5.inc
rename to poky/meta/conf/machine/include/arm/arch-armv5.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/arm/arch-armv6.inc b/poky/meta/conf/machine/include/arm/arch-armv6.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/arm/arch-armv6.inc
rename to poky/meta/conf/machine/include/arm/arch-armv6.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/arm/arch-armv7a.inc b/poky/meta/conf/machine/include/arm/arch-armv7a.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/arm/arch-armv7a.inc
rename to poky/meta/conf/machine/include/arm/arch-armv7a.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/arm/arch-armv7ve.inc b/poky/meta/conf/machine/include/arm/arch-armv7ve.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/arm/arch-armv7ve.inc
rename to poky/meta/conf/machine/include/arm/arch-armv7ve.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/arm/arch-armv8.inc b/poky/meta/conf/machine/include/arm/arch-armv8.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/arm/arch-armv8.inc
rename to poky/meta/conf/machine/include/arm/arch-armv8.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/arm/feature-arm-neon.inc b/poky/meta/conf/machine/include/arm/feature-arm-neon.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/arm/feature-arm-neon.inc
rename to poky/meta/conf/machine/include/arm/feature-arm-neon.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/arm/feature-arm-thumb.inc b/poky/meta/conf/machine/include/arm/feature-arm-thumb.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/arm/feature-arm-thumb.inc
rename to poky/meta/conf/machine/include/arm/feature-arm-thumb.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/arm/feature-arm-vfp.inc b/poky/meta/conf/machine/include/arm/feature-arm-vfp.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/arm/feature-arm-vfp.inc
rename to poky/meta/conf/machine/include/arm/feature-arm-vfp.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/microblaze/arch-microblaze.inc b/poky/meta/conf/machine/include/microblaze/arch-microblaze.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/microblaze/arch-microblaze.inc
rename to poky/meta/conf/machine/include/microblaze/arch-microblaze.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/microblaze/feature-microblaze-math.inc b/poky/meta/conf/machine/include/microblaze/feature-microblaze-math.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/microblaze/feature-microblaze-math.inc
rename to poky/meta/conf/machine/include/microblaze/feature-microblaze-math.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc b/poky/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc
rename to poky/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/mips/README b/poky/meta/conf/machine/include/mips/README
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/mips/README
rename to poky/meta/conf/machine/include/mips/README
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/mips/arch-mips.inc b/poky/meta/conf/machine/include/mips/arch-mips.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/mips/arch-mips.inc
rename to poky/meta/conf/machine/include/mips/arch-mips.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/mips/feature-mips-mips16e.inc b/poky/meta/conf/machine/include/mips/feature-mips-mips16e.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/mips/feature-mips-mips16e.inc
rename to poky/meta/conf/machine/include/mips/feature-mips-mips16e.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/mips/tune-mips-24k.inc b/poky/meta/conf/machine/include/mips/tune-mips-24k.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/mips/tune-mips-24k.inc
rename to poky/meta/conf/machine/include/mips/tune-mips-24k.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/powerpc/README b/poky/meta/conf/machine/include/powerpc/README
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/powerpc/README
rename to poky/meta/conf/machine/include/powerpc/README
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/powerpc/arch-powerpc.inc b/poky/meta/conf/machine/include/powerpc/arch-powerpc.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/powerpc/arch-powerpc.inc
rename to poky/meta/conf/machine/include/powerpc/arch-powerpc.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/powerpc/arch-powerpc64.inc b/poky/meta/conf/machine/include/powerpc/arch-powerpc64.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/powerpc/arch-powerpc64.inc
rename to poky/meta/conf/machine/include/powerpc/arch-powerpc64.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/qemu.inc b/poky/meta/conf/machine/include/qemu.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/qemu.inc
rename to poky/meta/conf/machine/include/qemu.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/qemuboot-mips.inc b/poky/meta/conf/machine/include/qemuboot-mips.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/qemuboot-mips.inc
rename to poky/meta/conf/machine/include/qemuboot-mips.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/qemuboot-x86.inc b/poky/meta/conf/machine/include/qemuboot-x86.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/qemuboot-x86.inc
rename to poky/meta/conf/machine/include/qemuboot-x86.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/sh/README b/poky/meta/conf/machine/include/sh/README
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/sh/README
rename to poky/meta/conf/machine/include/sh/README
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/sh/arch-sh.inc b/poky/meta/conf/machine/include/sh/arch-sh.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/sh/arch-sh.inc
rename to poky/meta/conf/machine/include/sh/arch-sh.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/soc-family.inc b/poky/meta/conf/machine/include/soc-family.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/soc-family.inc
rename to poky/meta/conf/machine/include/soc-family.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-arm1136jf-s.inc b/poky/meta/conf/machine/include/tune-arm1136jf-s.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-arm1136jf-s.inc
rename to poky/meta/conf/machine/include/tune-arm1136jf-s.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-arm920t.inc b/poky/meta/conf/machine/include/tune-arm920t.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-arm920t.inc
rename to poky/meta/conf/machine/include/tune-arm920t.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-arm926ejs.inc b/poky/meta/conf/machine/include/tune-arm926ejs.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-arm926ejs.inc
rename to poky/meta/conf/machine/include/tune-arm926ejs.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-arm9tdmi.inc b/poky/meta/conf/machine/include/tune-arm9tdmi.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-arm9tdmi.inc
rename to poky/meta/conf/machine/include/tune-arm9tdmi.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-atom.inc b/poky/meta/conf/machine/include/tune-atom.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-atom.inc
rename to poky/meta/conf/machine/include/tune-atom.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-c3.inc b/poky/meta/conf/machine/include/tune-c3.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-c3.inc
rename to poky/meta/conf/machine/include/tune-c3.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-core2.inc b/poky/meta/conf/machine/include/tune-core2.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-core2.inc
rename to poky/meta/conf/machine/include/tune-core2.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-corei7.inc b/poky/meta/conf/machine/include/tune-corei7.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-corei7.inc
rename to poky/meta/conf/machine/include/tune-corei7.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-cortexa15.inc b/poky/meta/conf/machine/include/tune-cortexa15.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-cortexa15.inc
rename to poky/meta/conf/machine/include/tune-cortexa15.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-cortexa17.inc b/poky/meta/conf/machine/include/tune-cortexa17.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-cortexa17.inc
rename to poky/meta/conf/machine/include/tune-cortexa17.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-cortexa5.inc b/poky/meta/conf/machine/include/tune-cortexa5.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-cortexa5.inc
rename to poky/meta/conf/machine/include/tune-cortexa5.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-cortexa7.inc b/poky/meta/conf/machine/include/tune-cortexa7.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-cortexa7.inc
rename to poky/meta/conf/machine/include/tune-cortexa7.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-cortexa8.inc b/poky/meta/conf/machine/include/tune-cortexa8.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-cortexa8.inc
rename to poky/meta/conf/machine/include/tune-cortexa8.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-cortexa9.inc b/poky/meta/conf/machine/include/tune-cortexa9.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-cortexa9.inc
rename to poky/meta/conf/machine/include/tune-cortexa9.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-ep9312.inc b/poky/meta/conf/machine/include/tune-ep9312.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-ep9312.inc
rename to poky/meta/conf/machine/include/tune-ep9312.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-i586-nlp.inc b/poky/meta/conf/machine/include/tune-i586-nlp.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-i586-nlp.inc
rename to poky/meta/conf/machine/include/tune-i586-nlp.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-i586.inc b/poky/meta/conf/machine/include/tune-i586.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-i586.inc
rename to poky/meta/conf/machine/include/tune-i586.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-i686.inc b/poky/meta/conf/machine/include/tune-i686.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-i686.inc
rename to poky/meta/conf/machine/include/tune-i686.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-iwmmxt.inc b/poky/meta/conf/machine/include/tune-iwmmxt.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-iwmmxt.inc
rename to poky/meta/conf/machine/include/tune-iwmmxt.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-microblaze.inc b/poky/meta/conf/machine/include/tune-microblaze.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-microblaze.inc
rename to poky/meta/conf/machine/include/tune-microblaze.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-mips32.inc b/poky/meta/conf/machine/include/tune-mips32.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-mips32.inc
rename to poky/meta/conf/machine/include/tune-mips32.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-mips32r2.inc b/poky/meta/conf/machine/include/tune-mips32r2.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-mips32r2.inc
rename to poky/meta/conf/machine/include/tune-mips32r2.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-mips32r6.inc b/poky/meta/conf/machine/include/tune-mips32r6.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-mips32r6.inc
rename to poky/meta/conf/machine/include/tune-mips32r6.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-mips64.inc b/poky/meta/conf/machine/include/tune-mips64.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-mips64.inc
rename to poky/meta/conf/machine/include/tune-mips64.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-mips64r2.inc b/poky/meta/conf/machine/include/tune-mips64r2.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-mips64r2.inc
rename to poky/meta/conf/machine/include/tune-mips64r2.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-mips64r6.inc b/poky/meta/conf/machine/include/tune-mips64r6.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-mips64r6.inc
rename to poky/meta/conf/machine/include/tune-mips64r6.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-octeon.inc b/poky/meta/conf/machine/include/tune-octeon.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-octeon.inc
rename to poky/meta/conf/machine/include/tune-octeon.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-power5.inc b/poky/meta/conf/machine/include/tune-power5.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-power5.inc
rename to poky/meta/conf/machine/include/tune-power5.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-power6.inc b/poky/meta/conf/machine/include/tune-power6.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-power6.inc
rename to poky/meta/conf/machine/include/tune-power6.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-power7.inc b/poky/meta/conf/machine/include/tune-power7.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-power7.inc
rename to poky/meta/conf/machine/include/tune-power7.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-ppc476.inc b/poky/meta/conf/machine/include/tune-ppc476.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-ppc476.inc
rename to poky/meta/conf/machine/include/tune-ppc476.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-ppc603e.inc b/poky/meta/conf/machine/include/tune-ppc603e.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-ppc603e.inc
rename to poky/meta/conf/machine/include/tune-ppc603e.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-ppc7400.inc b/poky/meta/conf/machine/include/tune-ppc7400.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-ppc7400.inc
rename to poky/meta/conf/machine/include/tune-ppc7400.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-ppce300c2.inc b/poky/meta/conf/machine/include/tune-ppce300c2.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-ppce300c2.inc
rename to poky/meta/conf/machine/include/tune-ppce300c2.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-ppce300c3.inc b/poky/meta/conf/machine/include/tune-ppce300c3.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-ppce300c3.inc
rename to poky/meta/conf/machine/include/tune-ppce300c3.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-ppce500.inc b/poky/meta/conf/machine/include/tune-ppce500.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-ppce500.inc
rename to poky/meta/conf/machine/include/tune-ppce500.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-ppce500mc.inc b/poky/meta/conf/machine/include/tune-ppce500mc.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-ppce500mc.inc
rename to poky/meta/conf/machine/include/tune-ppce500mc.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-ppce500v2.inc b/poky/meta/conf/machine/include/tune-ppce500v2.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-ppce500v2.inc
rename to poky/meta/conf/machine/include/tune-ppce500v2.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-ppce5500.inc b/poky/meta/conf/machine/include/tune-ppce5500.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-ppce5500.inc
rename to poky/meta/conf/machine/include/tune-ppce5500.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-ppce6500.inc b/poky/meta/conf/machine/include/tune-ppce6500.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-ppce6500.inc
rename to poky/meta/conf/machine/include/tune-ppce6500.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-sh3.inc b/poky/meta/conf/machine/include/tune-sh3.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-sh3.inc
rename to poky/meta/conf/machine/include/tune-sh3.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-sh4.inc b/poky/meta/conf/machine/include/tune-sh4.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-sh4.inc
rename to poky/meta/conf/machine/include/tune-sh4.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-strongarm1100.inc b/poky/meta/conf/machine/include/tune-strongarm1100.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-strongarm1100.inc
rename to poky/meta/conf/machine/include/tune-strongarm1100.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-supersparc.inc b/poky/meta/conf/machine/include/tune-supersparc.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-supersparc.inc
rename to poky/meta/conf/machine/include/tune-supersparc.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-thunderx.inc b/poky/meta/conf/machine/include/tune-thunderx.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-thunderx.inc
rename to poky/meta/conf/machine/include/tune-thunderx.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/tune-xscale.inc b/poky/meta/conf/machine/include/tune-xscale.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/tune-xscale.inc
rename to poky/meta/conf/machine/include/tune-xscale.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/x86-base.inc b/poky/meta/conf/machine/include/x86-base.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/x86-base.inc
rename to poky/meta/conf/machine/include/x86-base.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/x86/README b/poky/meta/conf/machine/include/x86/README
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/x86/README
rename to poky/meta/conf/machine/include/x86/README
diff --git a/import-layers/yocto-poky/meta/conf/machine/include/x86/arch-x86.inc b/poky/meta/conf/machine/include/x86/arch-x86.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/include/x86/arch-x86.inc
rename to poky/meta/conf/machine/include/x86/arch-x86.inc
diff --git a/import-layers/yocto-poky/meta/conf/machine/qemuarm.conf b/poky/meta/conf/machine/qemuarm.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/qemuarm.conf
rename to poky/meta/conf/machine/qemuarm.conf
diff --git a/import-layers/yocto-poky/meta/conf/machine/qemuarm64.conf b/poky/meta/conf/machine/qemuarm64.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/qemuarm64.conf
rename to poky/meta/conf/machine/qemuarm64.conf
diff --git a/import-layers/yocto-poky/meta/conf/machine/qemumips.conf b/poky/meta/conf/machine/qemumips.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/qemumips.conf
rename to poky/meta/conf/machine/qemumips.conf
diff --git a/import-layers/yocto-poky/meta/conf/machine/qemumips64.conf b/poky/meta/conf/machine/qemumips64.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/qemumips64.conf
rename to poky/meta/conf/machine/qemumips64.conf
diff --git a/import-layers/yocto-poky/meta/conf/machine/qemuppc.conf b/poky/meta/conf/machine/qemuppc.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/qemuppc.conf
rename to poky/meta/conf/machine/qemuppc.conf
diff --git a/import-layers/yocto-poky/meta/conf/machine/qemux86-64.conf b/poky/meta/conf/machine/qemux86-64.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/qemux86-64.conf
rename to poky/meta/conf/machine/qemux86-64.conf
diff --git a/import-layers/yocto-poky/meta/conf/machine/qemux86.conf b/poky/meta/conf/machine/qemux86.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/machine/qemux86.conf
rename to poky/meta/conf/machine/qemux86.conf
diff --git a/import-layers/yocto-poky/meta/conf/migrate_localcount.conf b/poky/meta/conf/migrate_localcount.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/migrate_localcount.conf
rename to poky/meta/conf/migrate_localcount.conf
diff --git a/import-layers/yocto-poky/meta/conf/multiconfig/default.conf b/poky/meta/conf/multiconfig/default.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/multiconfig/default.conf
rename to poky/meta/conf/multiconfig/default.conf
diff --git a/import-layers/yocto-poky/meta/conf/multilib.conf b/poky/meta/conf/multilib.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/multilib.conf
rename to poky/meta/conf/multilib.conf
diff --git a/import-layers/yocto-poky/meta/conf/prexport.conf b/poky/meta/conf/prexport.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/prexport.conf
rename to poky/meta/conf/prexport.conf
diff --git a/import-layers/yocto-poky/meta/conf/primport.conf b/poky/meta/conf/primport.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/primport.conf
rename to poky/meta/conf/primport.conf
diff --git a/import-layers/yocto-poky/meta/conf/sanity.conf b/poky/meta/conf/sanity.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/conf/sanity.conf
rename to poky/meta/conf/sanity.conf
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/AAL b/poky/meta/files/common-licenses/AAL
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/AAL
rename to poky/meta/files/common-licenses/AAL
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/AFL-1.2 b/poky/meta/files/common-licenses/AFL-1.2
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/AFL-1.2
rename to poky/meta/files/common-licenses/AFL-1.2
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/AFL-2.0 b/poky/meta/files/common-licenses/AFL-2.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/AFL-2.0
rename to poky/meta/files/common-licenses/AFL-2.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/AFL-2.1 b/poky/meta/files/common-licenses/AFL-2.1
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/AFL-2.1
rename to poky/meta/files/common-licenses/AFL-2.1
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/AFL-3.0 b/poky/meta/files/common-licenses/AFL-3.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/AFL-3.0
rename to poky/meta/files/common-licenses/AFL-3.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/AGPL-3.0 b/poky/meta/files/common-licenses/AGPL-3.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/AGPL-3.0
rename to poky/meta/files/common-licenses/AGPL-3.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/ANTLR-PD b/poky/meta/files/common-licenses/ANTLR-PD
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/ANTLR-PD
rename to poky/meta/files/common-licenses/ANTLR-PD
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/APL-1.0 b/poky/meta/files/common-licenses/APL-1.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/APL-1.0
rename to poky/meta/files/common-licenses/APL-1.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/APSL-1.0 b/poky/meta/files/common-licenses/APSL-1.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/APSL-1.0
rename to poky/meta/files/common-licenses/APSL-1.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/APSL-1.1 b/poky/meta/files/common-licenses/APSL-1.1
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/APSL-1.1
rename to poky/meta/files/common-licenses/APSL-1.1
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/APSL-1.2 b/poky/meta/files/common-licenses/APSL-1.2
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/APSL-1.2
rename to poky/meta/files/common-licenses/APSL-1.2
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/APSL-2.0 b/poky/meta/files/common-licenses/APSL-2.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/APSL-2.0
rename to poky/meta/files/common-licenses/APSL-2.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/Adobe b/poky/meta/files/common-licenses/Adobe
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/Adobe
rename to poky/meta/files/common-licenses/Adobe
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/Apache-1.0 b/poky/meta/files/common-licenses/Apache-1.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/Apache-1.0
rename to poky/meta/files/common-licenses/Apache-1.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/Apache-1.1 b/poky/meta/files/common-licenses/Apache-1.1
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/Apache-1.1
rename to poky/meta/files/common-licenses/Apache-1.1
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/Apache-2.0 b/poky/meta/files/common-licenses/Apache-2.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/Apache-2.0
rename to poky/meta/files/common-licenses/Apache-2.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/Artistic-1.0 b/poky/meta/files/common-licenses/Artistic-1.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/Artistic-1.0
rename to poky/meta/files/common-licenses/Artistic-1.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/Artistic-2.0 b/poky/meta/files/common-licenses/Artistic-2.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/Artistic-2.0
rename to poky/meta/files/common-licenses/Artistic-2.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/BSD b/poky/meta/files/common-licenses/BSD
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/BSD
rename to poky/meta/files/common-licenses/BSD
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/BSD-0-Clause b/poky/meta/files/common-licenses/BSD-0-Clause
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/BSD-0-Clause
rename to poky/meta/files/common-licenses/BSD-0-Clause
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/BSD-1-Clause b/poky/meta/files/common-licenses/BSD-1-Clause
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/BSD-1-Clause
rename to poky/meta/files/common-licenses/BSD-1-Clause
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/BSD-2-Clause b/poky/meta/files/common-licenses/BSD-2-Clause
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/BSD-2-Clause
rename to poky/meta/files/common-licenses/BSD-2-Clause
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/BSD-3-Clause b/poky/meta/files/common-licenses/BSD-3-Clause
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/BSD-3-Clause
rename to poky/meta/files/common-licenses/BSD-3-Clause
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/BSD-4-Clause b/poky/meta/files/common-licenses/BSD-4-Clause
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/BSD-4-Clause
rename to poky/meta/files/common-licenses/BSD-4-Clause
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/BSL-1.0 b/poky/meta/files/common-licenses/BSL-1.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/BSL-1.0
rename to poky/meta/files/common-licenses/BSL-1.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/BitstreamVera b/poky/meta/files/common-licenses/BitstreamVera
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/BitstreamVera
rename to poky/meta/files/common-licenses/BitstreamVera
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/CATOSL-1.1 b/poky/meta/files/common-licenses/CATOSL-1.1
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/CATOSL-1.1
rename to poky/meta/files/common-licenses/CATOSL-1.1
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/CC-BY-1.0 b/poky/meta/files/common-licenses/CC-BY-1.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/CC-BY-1.0
rename to poky/meta/files/common-licenses/CC-BY-1.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/CC-BY-2.0 b/poky/meta/files/common-licenses/CC-BY-2.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/CC-BY-2.0
rename to poky/meta/files/common-licenses/CC-BY-2.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/CC-BY-2.5 b/poky/meta/files/common-licenses/CC-BY-2.5
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/CC-BY-2.5
rename to poky/meta/files/common-licenses/CC-BY-2.5
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/CC-BY-3.0 b/poky/meta/files/common-licenses/CC-BY-3.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/CC-BY-3.0
rename to poky/meta/files/common-licenses/CC-BY-3.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/CC-BY-NC-1.0 b/poky/meta/files/common-licenses/CC-BY-NC-1.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/CC-BY-NC-1.0
rename to poky/meta/files/common-licenses/CC-BY-NC-1.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/CC-BY-NC-2.0 b/poky/meta/files/common-licenses/CC-BY-NC-2.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/CC-BY-NC-2.0
rename to poky/meta/files/common-licenses/CC-BY-NC-2.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/CC-BY-NC-2.5 b/poky/meta/files/common-licenses/CC-BY-NC-2.5
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/CC-BY-NC-2.5
rename to poky/meta/files/common-licenses/CC-BY-NC-2.5
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/CC-BY-NC-3.0 b/poky/meta/files/common-licenses/CC-BY-NC-3.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/CC-BY-NC-3.0
rename to poky/meta/files/common-licenses/CC-BY-NC-3.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/CC-BY-NC-ND-1.0 b/poky/meta/files/common-licenses/CC-BY-NC-ND-1.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/CC-BY-NC-ND-1.0
rename to poky/meta/files/common-licenses/CC-BY-NC-ND-1.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/CC-BY-NC-ND-2.0 b/poky/meta/files/common-licenses/CC-BY-NC-ND-2.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/CC-BY-NC-ND-2.0
rename to poky/meta/files/common-licenses/CC-BY-NC-ND-2.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/CC-BY-NC-ND-2.5 b/poky/meta/files/common-licenses/CC-BY-NC-ND-2.5
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/CC-BY-NC-ND-2.5
rename to poky/meta/files/common-licenses/CC-BY-NC-ND-2.5
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/CC-BY-NC-ND-3.0 b/poky/meta/files/common-licenses/CC-BY-NC-ND-3.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/CC-BY-NC-ND-3.0
rename to poky/meta/files/common-licenses/CC-BY-NC-ND-3.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/CC-BY-NC-SA-1.0 b/poky/meta/files/common-licenses/CC-BY-NC-SA-1.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/CC-BY-NC-SA-1.0
rename to poky/meta/files/common-licenses/CC-BY-NC-SA-1.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/CC-BY-NC-SA-2.0 b/poky/meta/files/common-licenses/CC-BY-NC-SA-2.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/CC-BY-NC-SA-2.0
rename to poky/meta/files/common-licenses/CC-BY-NC-SA-2.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/CC-BY-NC-SA-2.5 b/poky/meta/files/common-licenses/CC-BY-NC-SA-2.5
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/CC-BY-NC-SA-2.5
rename to poky/meta/files/common-licenses/CC-BY-NC-SA-2.5
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/CC-BY-NC-SA-3.0 b/poky/meta/files/common-licenses/CC-BY-NC-SA-3.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/CC-BY-NC-SA-3.0
rename to poky/meta/files/common-licenses/CC-BY-NC-SA-3.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/CC-BY-ND-1.0 b/poky/meta/files/common-licenses/CC-BY-ND-1.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/CC-BY-ND-1.0
rename to poky/meta/files/common-licenses/CC-BY-ND-1.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/CC-BY-ND-2.0 b/poky/meta/files/common-licenses/CC-BY-ND-2.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/CC-BY-ND-2.0
rename to poky/meta/files/common-licenses/CC-BY-ND-2.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/CC-BY-ND-2.5 b/poky/meta/files/common-licenses/CC-BY-ND-2.5
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/CC-BY-ND-2.5
rename to poky/meta/files/common-licenses/CC-BY-ND-2.5
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/CC-BY-ND-3.0 b/poky/meta/files/common-licenses/CC-BY-ND-3.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/CC-BY-ND-3.0
rename to poky/meta/files/common-licenses/CC-BY-ND-3.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/CC-BY-SA-1.0 b/poky/meta/files/common-licenses/CC-BY-SA-1.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/CC-BY-SA-1.0
rename to poky/meta/files/common-licenses/CC-BY-SA-1.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/CC-BY-SA-2.0 b/poky/meta/files/common-licenses/CC-BY-SA-2.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/CC-BY-SA-2.0
rename to poky/meta/files/common-licenses/CC-BY-SA-2.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/CC-BY-SA-2.5 b/poky/meta/files/common-licenses/CC-BY-SA-2.5
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/CC-BY-SA-2.5
rename to poky/meta/files/common-licenses/CC-BY-SA-2.5
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/CC-BY-SA-3.0 b/poky/meta/files/common-licenses/CC-BY-SA-3.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/CC-BY-SA-3.0
rename to poky/meta/files/common-licenses/CC-BY-SA-3.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/CC0-1.0 b/poky/meta/files/common-licenses/CC0-1.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/CC0-1.0
rename to poky/meta/files/common-licenses/CC0-1.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/CDDL-1.0 b/poky/meta/files/common-licenses/CDDL-1.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/CDDL-1.0
rename to poky/meta/files/common-licenses/CDDL-1.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/CECILL-1.0 b/poky/meta/files/common-licenses/CECILL-1.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/CECILL-1.0
rename to poky/meta/files/common-licenses/CECILL-1.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/CECILL-2.0 b/poky/meta/files/common-licenses/CECILL-2.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/CECILL-2.0
rename to poky/meta/files/common-licenses/CECILL-2.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/CECILL-B b/poky/meta/files/common-licenses/CECILL-B
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/CECILL-B
rename to poky/meta/files/common-licenses/CECILL-B
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/CECILL-C b/poky/meta/files/common-licenses/CECILL-C
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/CECILL-C
rename to poky/meta/files/common-licenses/CECILL-C
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/CPAL-1.0 b/poky/meta/files/common-licenses/CPAL-1.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/CPAL-1.0
rename to poky/meta/files/common-licenses/CPAL-1.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/CPL-1.0 b/poky/meta/files/common-licenses/CPL-1.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/CPL-1.0
rename to poky/meta/files/common-licenses/CPL-1.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/CUA-OPL-1.0 b/poky/meta/files/common-licenses/CUA-OPL-1.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/CUA-OPL-1.0
rename to poky/meta/files/common-licenses/CUA-OPL-1.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/ClArtistic b/poky/meta/files/common-licenses/ClArtistic
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/ClArtistic
rename to poky/meta/files/common-licenses/ClArtistic
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/DSSSL b/poky/meta/files/common-licenses/DSSSL
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/DSSSL
rename to poky/meta/files/common-licenses/DSSSL
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/ECL-1.0 b/poky/meta/files/common-licenses/ECL-1.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/ECL-1.0
rename to poky/meta/files/common-licenses/ECL-1.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/ECL-2.0 b/poky/meta/files/common-licenses/ECL-2.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/ECL-2.0
rename to poky/meta/files/common-licenses/ECL-2.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/EDL-1.0 b/poky/meta/files/common-licenses/EDL-1.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/EDL-1.0
rename to poky/meta/files/common-licenses/EDL-1.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/EFL-1.0 b/poky/meta/files/common-licenses/EFL-1.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/EFL-1.0
rename to poky/meta/files/common-licenses/EFL-1.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/EFL-2.0 b/poky/meta/files/common-licenses/EFL-2.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/EFL-2.0
rename to poky/meta/files/common-licenses/EFL-2.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/EPL-1.0 b/poky/meta/files/common-licenses/EPL-1.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/EPL-1.0
rename to poky/meta/files/common-licenses/EPL-1.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/EUDatagrid b/poky/meta/files/common-licenses/EUDatagrid
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/EUDatagrid
rename to poky/meta/files/common-licenses/EUDatagrid
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/EUPL-1.0 b/poky/meta/files/common-licenses/EUPL-1.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/EUPL-1.0
rename to poky/meta/files/common-licenses/EUPL-1.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/EUPL-1.1 b/poky/meta/files/common-licenses/EUPL-1.1
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/EUPL-1.1
rename to poky/meta/files/common-licenses/EUPL-1.1
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/Elfutils-Exception b/poky/meta/files/common-licenses/Elfutils-Exception
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/Elfutils-Exception
rename to poky/meta/files/common-licenses/Elfutils-Exception
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/Entessa b/poky/meta/files/common-licenses/Entessa
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/Entessa
rename to poky/meta/files/common-licenses/Entessa
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/ErlPL-1.1 b/poky/meta/files/common-licenses/ErlPL-1.1
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/ErlPL-1.1
rename to poky/meta/files/common-licenses/ErlPL-1.1
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/FSF-Unlimited b/poky/meta/files/common-licenses/FSF-Unlimited
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/FSF-Unlimited
rename to poky/meta/files/common-licenses/FSF-Unlimited
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/Fair b/poky/meta/files/common-licenses/Fair
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/Fair
rename to poky/meta/files/common-licenses/Fair
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/Frameworx-1.0 b/poky/meta/files/common-licenses/Frameworx-1.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/Frameworx-1.0
rename to poky/meta/files/common-licenses/Frameworx-1.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/FreeType b/poky/meta/files/common-licenses/FreeType
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/FreeType
rename to poky/meta/files/common-licenses/FreeType
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/GFDL-1.1 b/poky/meta/files/common-licenses/GFDL-1.1
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/GFDL-1.1
rename to poky/meta/files/common-licenses/GFDL-1.1
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/GFDL-1.2 b/poky/meta/files/common-licenses/GFDL-1.2
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/GFDL-1.2
rename to poky/meta/files/common-licenses/GFDL-1.2
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/GFDL-1.3 b/poky/meta/files/common-licenses/GFDL-1.3
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/GFDL-1.3
rename to poky/meta/files/common-licenses/GFDL-1.3
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/GPL-1.0 b/poky/meta/files/common-licenses/GPL-1.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/GPL-1.0
rename to poky/meta/files/common-licenses/GPL-1.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/GPL-2-with-bison-exception b/poky/meta/files/common-licenses/GPL-2-with-bison-exception
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/GPL-2-with-bison-exception
rename to poky/meta/files/common-licenses/GPL-2-with-bison-exception
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/GPL-2.0 b/poky/meta/files/common-licenses/GPL-2.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/GPL-2.0
rename to poky/meta/files/common-licenses/GPL-2.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/GPL-2.0-with-GCC-exception b/poky/meta/files/common-licenses/GPL-2.0-with-GCC-exception
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/GPL-2.0-with-GCC-exception
rename to poky/meta/files/common-licenses/GPL-2.0-with-GCC-exception
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/GPL-2.0-with-OpenSSL-exception b/poky/meta/files/common-licenses/GPL-2.0-with-OpenSSL-exception
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/GPL-2.0-with-OpenSSL-exception
rename to poky/meta/files/common-licenses/GPL-2.0-with-OpenSSL-exception
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/GPL-2.0-with-autoconf-exception b/poky/meta/files/common-licenses/GPL-2.0-with-autoconf-exception
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/GPL-2.0-with-autoconf-exception
rename to poky/meta/files/common-licenses/GPL-2.0-with-autoconf-exception
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/GPL-2.0-with-classpath-exception b/poky/meta/files/common-licenses/GPL-2.0-with-classpath-exception
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/GPL-2.0-with-classpath-exception
rename to poky/meta/files/common-licenses/GPL-2.0-with-classpath-exception
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/GPL-2.0-with-font-exception b/poky/meta/files/common-licenses/GPL-2.0-with-font-exception
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/GPL-2.0-with-font-exception
rename to poky/meta/files/common-licenses/GPL-2.0-with-font-exception
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/GPL-3.0 b/poky/meta/files/common-licenses/GPL-3.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/GPL-3.0
rename to poky/meta/files/common-licenses/GPL-3.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/GPL-3.0-with-GCC-exception b/poky/meta/files/common-licenses/GPL-3.0-with-GCC-exception
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/GPL-3.0-with-GCC-exception
rename to poky/meta/files/common-licenses/GPL-3.0-with-GCC-exception
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/GPL-3.0-with-autoconf-exception b/poky/meta/files/common-licenses/GPL-3.0-with-autoconf-exception
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/GPL-3.0-with-autoconf-exception
rename to poky/meta/files/common-licenses/GPL-3.0-with-autoconf-exception
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/HPND b/poky/meta/files/common-licenses/HPND
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/HPND
rename to poky/meta/files/common-licenses/HPND
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/ICU b/poky/meta/files/common-licenses/ICU
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/ICU
rename to poky/meta/files/common-licenses/ICU
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/IPA b/poky/meta/files/common-licenses/IPA
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/IPA
rename to poky/meta/files/common-licenses/IPA
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/IPL-1.0 b/poky/meta/files/common-licenses/IPL-1.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/IPL-1.0
rename to poky/meta/files/common-licenses/IPL-1.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/ISC b/poky/meta/files/common-licenses/ISC
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/ISC
rename to poky/meta/files/common-licenses/ISC
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/LGPL-2.0 b/poky/meta/files/common-licenses/LGPL-2.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/LGPL-2.0
rename to poky/meta/files/common-licenses/LGPL-2.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/LGPL-2.1 b/poky/meta/files/common-licenses/LGPL-2.1
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/LGPL-2.1
rename to poky/meta/files/common-licenses/LGPL-2.1
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/LGPL-3.0 b/poky/meta/files/common-licenses/LGPL-3.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/LGPL-3.0
rename to poky/meta/files/common-licenses/LGPL-3.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/LPL-1.02 b/poky/meta/files/common-licenses/LPL-1.02
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/LPL-1.02
rename to poky/meta/files/common-licenses/LPL-1.02
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/LPPL-1.0 b/poky/meta/files/common-licenses/LPPL-1.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/LPPL-1.0
rename to poky/meta/files/common-licenses/LPPL-1.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/LPPL-1.1 b/poky/meta/files/common-licenses/LPPL-1.1
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/LPPL-1.1
rename to poky/meta/files/common-licenses/LPPL-1.1
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/LPPL-1.2 b/poky/meta/files/common-licenses/LPPL-1.2
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/LPPL-1.2
rename to poky/meta/files/common-licenses/LPPL-1.2
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/LPPL-1.3c b/poky/meta/files/common-licenses/LPPL-1.3c
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/LPPL-1.3c
rename to poky/meta/files/common-licenses/LPPL-1.3c
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/Libpng b/poky/meta/files/common-licenses/Libpng
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/Libpng
rename to poky/meta/files/common-licenses/Libpng
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/MIT b/poky/meta/files/common-licenses/MIT
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/MIT
rename to poky/meta/files/common-licenses/MIT
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/MPL-1.0 b/poky/meta/files/common-licenses/MPL-1.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/MPL-1.0
rename to poky/meta/files/common-licenses/MPL-1.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/MPL-1.1 b/poky/meta/files/common-licenses/MPL-1.1
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/MPL-1.1
rename to poky/meta/files/common-licenses/MPL-1.1
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/MPL-2.0 b/poky/meta/files/common-licenses/MPL-2.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/MPL-2.0
rename to poky/meta/files/common-licenses/MPL-2.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/MS-PL b/poky/meta/files/common-licenses/MS-PL
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/MS-PL
rename to poky/meta/files/common-licenses/MS-PL
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/MS-RL b/poky/meta/files/common-licenses/MS-RL
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/MS-RL
rename to poky/meta/files/common-licenses/MS-RL
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/MirOS b/poky/meta/files/common-licenses/MirOS
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/MirOS
rename to poky/meta/files/common-licenses/MirOS
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/Motosoto b/poky/meta/files/common-licenses/Motosoto
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/Motosoto
rename to poky/meta/files/common-licenses/Motosoto
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/Multics b/poky/meta/files/common-licenses/Multics
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/Multics
rename to poky/meta/files/common-licenses/Multics
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/NASA-1.3 b/poky/meta/files/common-licenses/NASA-1.3
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/NASA-1.3
rename to poky/meta/files/common-licenses/NASA-1.3
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/NCSA b/poky/meta/files/common-licenses/NCSA
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/NCSA
rename to poky/meta/files/common-licenses/NCSA
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/NGPL b/poky/meta/files/common-licenses/NGPL
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/NGPL
rename to poky/meta/files/common-licenses/NGPL
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/NPOSL-3.0 b/poky/meta/files/common-licenses/NPOSL-3.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/NPOSL-3.0
rename to poky/meta/files/common-licenses/NPOSL-3.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/NTP b/poky/meta/files/common-licenses/NTP
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/NTP
rename to poky/meta/files/common-licenses/NTP
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/Nauman b/poky/meta/files/common-licenses/Nauman
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/Nauman
rename to poky/meta/files/common-licenses/Nauman
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/Nokia b/poky/meta/files/common-licenses/Nokia
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/Nokia
rename to poky/meta/files/common-licenses/Nokia
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/OASIS b/poky/meta/files/common-licenses/OASIS
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/OASIS
rename to poky/meta/files/common-licenses/OASIS
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/OCLC-2.0 b/poky/meta/files/common-licenses/OCLC-2.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/OCLC-2.0
rename to poky/meta/files/common-licenses/OCLC-2.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/ODbL-1.0 b/poky/meta/files/common-licenses/ODbL-1.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/ODbL-1.0
rename to poky/meta/files/common-licenses/ODbL-1.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/OFL-1.1 b/poky/meta/files/common-licenses/OFL-1.1
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/OFL-1.1
rename to poky/meta/files/common-licenses/OFL-1.1
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/OGTSL b/poky/meta/files/common-licenses/OGTSL
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/OGTSL
rename to poky/meta/files/common-licenses/OGTSL
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/OLDAP-2.8 b/poky/meta/files/common-licenses/OLDAP-2.8
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/OLDAP-2.8
rename to poky/meta/files/common-licenses/OLDAP-2.8
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/OSL-1.0 b/poky/meta/files/common-licenses/OSL-1.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/OSL-1.0
rename to poky/meta/files/common-licenses/OSL-1.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/OSL-2.0 b/poky/meta/files/common-licenses/OSL-2.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/OSL-2.0
rename to poky/meta/files/common-licenses/OSL-2.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/OSL-3.0 b/poky/meta/files/common-licenses/OSL-3.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/OSL-3.0
rename to poky/meta/files/common-licenses/OSL-3.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/OpenSSL b/poky/meta/files/common-licenses/OpenSSL
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/OpenSSL
rename to poky/meta/files/common-licenses/OpenSSL
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/PD b/poky/meta/files/common-licenses/PD
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/PD
rename to poky/meta/files/common-licenses/PD
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/PHP-3.0 b/poky/meta/files/common-licenses/PHP-3.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/PHP-3.0
rename to poky/meta/files/common-licenses/PHP-3.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/ParaTypeFFL-1.3 b/poky/meta/files/common-licenses/ParaTypeFFL-1.3
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/ParaTypeFFL-1.3
rename to poky/meta/files/common-licenses/ParaTypeFFL-1.3
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/PostgreSQL b/poky/meta/files/common-licenses/PostgreSQL
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/PostgreSQL
rename to poky/meta/files/common-licenses/PostgreSQL
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/Proprietary b/poky/meta/files/common-licenses/Proprietary
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/Proprietary
rename to poky/meta/files/common-licenses/Proprietary
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/Python-2.0 b/poky/meta/files/common-licenses/Python-2.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/Python-2.0
rename to poky/meta/files/common-licenses/Python-2.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/QPL-1.0 b/poky/meta/files/common-licenses/QPL-1.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/QPL-1.0
rename to poky/meta/files/common-licenses/QPL-1.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/RHeCos-1 b/poky/meta/files/common-licenses/RHeCos-1
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/RHeCos-1
rename to poky/meta/files/common-licenses/RHeCos-1
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/RHeCos-1.1 b/poky/meta/files/common-licenses/RHeCos-1.1
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/RHeCos-1.1
rename to poky/meta/files/common-licenses/RHeCos-1.1
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/RPL-1.5 b/poky/meta/files/common-licenses/RPL-1.5
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/RPL-1.5
rename to poky/meta/files/common-licenses/RPL-1.5
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/RPSL-1.0 b/poky/meta/files/common-licenses/RPSL-1.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/RPSL-1.0
rename to poky/meta/files/common-licenses/RPSL-1.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/RSCPL b/poky/meta/files/common-licenses/RSCPL
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/RSCPL
rename to poky/meta/files/common-licenses/RSCPL
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/Ruby b/poky/meta/files/common-licenses/Ruby
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/Ruby
rename to poky/meta/files/common-licenses/Ruby
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/SAX-PD b/poky/meta/files/common-licenses/SAX-PD
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/SAX-PD
rename to poky/meta/files/common-licenses/SAX-PD
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/SGI-1 b/poky/meta/files/common-licenses/SGI-1
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/SGI-1
rename to poky/meta/files/common-licenses/SGI-1
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/SMAIL_GPL b/poky/meta/files/common-licenses/SMAIL_GPL
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/SMAIL_GPL
rename to poky/meta/files/common-licenses/SMAIL_GPL
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/SPL-1.0 b/poky/meta/files/common-licenses/SPL-1.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/SPL-1.0
rename to poky/meta/files/common-licenses/SPL-1.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/Simple-2.0 b/poky/meta/files/common-licenses/Simple-2.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/Simple-2.0
rename to poky/meta/files/common-licenses/Simple-2.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/Sleepycat b/poky/meta/files/common-licenses/Sleepycat
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/Sleepycat
rename to poky/meta/files/common-licenses/Sleepycat
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/SugarCRM-1 b/poky/meta/files/common-licenses/SugarCRM-1
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/SugarCRM-1
rename to poky/meta/files/common-licenses/SugarCRM-1
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/SugarCRM-1.1.3 b/poky/meta/files/common-licenses/SugarCRM-1.1.3
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/SugarCRM-1.1.3
rename to poky/meta/files/common-licenses/SugarCRM-1.1.3
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/UCB b/poky/meta/files/common-licenses/UCB
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/UCB
rename to poky/meta/files/common-licenses/UCB
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/VSL-1.0 b/poky/meta/files/common-licenses/VSL-1.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/VSL-1.0
rename to poky/meta/files/common-licenses/VSL-1.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/W3C b/poky/meta/files/common-licenses/W3C
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/W3C
rename to poky/meta/files/common-licenses/W3C
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/WXwindows b/poky/meta/files/common-licenses/WXwindows
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/WXwindows
rename to poky/meta/files/common-licenses/WXwindows
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/Watcom-1.0 b/poky/meta/files/common-licenses/Watcom-1.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/Watcom-1.0
rename to poky/meta/files/common-licenses/Watcom-1.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/XFree86-1.0 b/poky/meta/files/common-licenses/XFree86-1.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/XFree86-1.0
rename to poky/meta/files/common-licenses/XFree86-1.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/XFree86-1.1 b/poky/meta/files/common-licenses/XFree86-1.1
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/XFree86-1.1
rename to poky/meta/files/common-licenses/XFree86-1.1
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/XSL b/poky/meta/files/common-licenses/XSL
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/XSL
rename to poky/meta/files/common-licenses/XSL
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/Xnet b/poky/meta/files/common-licenses/Xnet
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/Xnet
rename to poky/meta/files/common-licenses/Xnet
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/YPL-1.1 b/poky/meta/files/common-licenses/YPL-1.1
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/YPL-1.1
rename to poky/meta/files/common-licenses/YPL-1.1
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/ZPL-1.1 b/poky/meta/files/common-licenses/ZPL-1.1
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/ZPL-1.1
rename to poky/meta/files/common-licenses/ZPL-1.1
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/ZPL-2.0 b/poky/meta/files/common-licenses/ZPL-2.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/ZPL-2.0
rename to poky/meta/files/common-licenses/ZPL-2.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/ZPL-2.1 b/poky/meta/files/common-licenses/ZPL-2.1
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/ZPL-2.1
rename to poky/meta/files/common-licenses/ZPL-2.1
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/Zimbra-1.3 b/poky/meta/files/common-licenses/Zimbra-1.3
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/Zimbra-1.3
rename to poky/meta/files/common-licenses/Zimbra-1.3
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/Zlib b/poky/meta/files/common-licenses/Zlib
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/Zlib
rename to poky/meta/files/common-licenses/Zlib
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/bzip2 b/poky/meta/files/common-licenses/bzip2
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/bzip2
rename to poky/meta/files/common-licenses/bzip2
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/eCos-2.0 b/poky/meta/files/common-licenses/eCos-2.0
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/eCos-2.0
rename to poky/meta/files/common-licenses/eCos-2.0
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/gSOAP-1 b/poky/meta/files/common-licenses/gSOAP-1
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/gSOAP-1
rename to poky/meta/files/common-licenses/gSOAP-1
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/gSOAP-1.3b b/poky/meta/files/common-licenses/gSOAP-1.3b
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/gSOAP-1.3b
rename to poky/meta/files/common-licenses/gSOAP-1.3b
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/pkgconf b/poky/meta/files/common-licenses/pkgconf
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/pkgconf
rename to poky/meta/files/common-licenses/pkgconf
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/tcl b/poky/meta/files/common-licenses/tcl
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/tcl
rename to poky/meta/files/common-licenses/tcl
diff --git a/import-layers/yocto-poky/meta/files/common-licenses/unfs3 b/poky/meta/files/common-licenses/unfs3
similarity index 100%
rename from import-layers/yocto-poky/meta/files/common-licenses/unfs3
rename to poky/meta/files/common-licenses/unfs3
diff --git a/import-layers/yocto-poky/meta/files/device_table-minimal.txt b/poky/meta/files/device_table-minimal.txt
similarity index 100%
rename from import-layers/yocto-poky/meta/files/device_table-minimal.txt
rename to poky/meta/files/device_table-minimal.txt
diff --git a/import-layers/yocto-poky/meta/files/ext-sdk-prepare.py b/poky/meta/files/ext-sdk-prepare.py
similarity index 100%
rename from import-layers/yocto-poky/meta/files/ext-sdk-prepare.py
rename to poky/meta/files/ext-sdk-prepare.py
diff --git a/import-layers/yocto-poky/meta/files/fs-perms-persistent-log.txt b/poky/meta/files/fs-perms-persistent-log.txt
similarity index 100%
rename from import-layers/yocto-poky/meta/files/fs-perms-persistent-log.txt
rename to poky/meta/files/fs-perms-persistent-log.txt
diff --git a/import-layers/yocto-poky/meta/files/fs-perms.txt b/poky/meta/files/fs-perms.txt
similarity index 100%
rename from import-layers/yocto-poky/meta/files/fs-perms.txt
rename to poky/meta/files/fs-perms.txt
diff --git a/import-layers/yocto-poky/meta/files/ptest-perl/run-ptest b/poky/meta/files/ptest-perl/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/files/ptest-perl/run-ptest
rename to poky/meta/files/ptest-perl/run-ptest
diff --git a/import-layers/yocto-poky/meta/files/toolchain-shar-extract.sh b/poky/meta/files/toolchain-shar-extract.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/files/toolchain-shar-extract.sh
rename to poky/meta/files/toolchain-shar-extract.sh
diff --git a/import-layers/yocto-poky/meta/files/toolchain-shar-relocate.sh b/poky/meta/files/toolchain-shar-relocate.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/files/toolchain-shar-relocate.sh
rename to poky/meta/files/toolchain-shar-relocate.sh
diff --git a/import-layers/yocto-poky/meta/lib/bblayers/create.py b/poky/meta/lib/bblayers/create.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/bblayers/create.py
rename to poky/meta/lib/bblayers/create.py
diff --git a/import-layers/yocto-poky/meta/lib/bblayers/templates/README b/poky/meta/lib/bblayers/templates/README
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/bblayers/templates/README
rename to poky/meta/lib/bblayers/templates/README
diff --git a/import-layers/yocto-poky/meta/lib/bblayers/templates/example.bb b/poky/meta/lib/bblayers/templates/example.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/bblayers/templates/example.bb
rename to poky/meta/lib/bblayers/templates/example.bb
diff --git a/import-layers/yocto-poky/meta/lib/bblayers/templates/layer.conf b/poky/meta/lib/bblayers/templates/layer.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/bblayers/templates/layer.conf
rename to poky/meta/lib/bblayers/templates/layer.conf
diff --git a/import-layers/yocto-poky/meta/lib/buildstats.py b/poky/meta/lib/buildstats.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/buildstats.py
rename to poky/meta/lib/buildstats.py
diff --git a/import-layers/yocto-poky/meta/lib/oe/__init__.py b/poky/meta/lib/oe/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oe/__init__.py
rename to poky/meta/lib/oe/__init__.py
diff --git a/import-layers/yocto-poky/meta/lib/oe/buildhistory_analysis.py b/poky/meta/lib/oe/buildhistory_analysis.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oe/buildhistory_analysis.py
rename to poky/meta/lib/oe/buildhistory_analysis.py
diff --git a/import-layers/yocto-poky/meta/lib/oe/cachedpath.py b/poky/meta/lib/oe/cachedpath.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oe/cachedpath.py
rename to poky/meta/lib/oe/cachedpath.py
diff --git a/import-layers/yocto-poky/meta/lib/oe/classextend.py b/poky/meta/lib/oe/classextend.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oe/classextend.py
rename to poky/meta/lib/oe/classextend.py
diff --git a/import-layers/yocto-poky/meta/lib/oe/classutils.py b/poky/meta/lib/oe/classutils.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oe/classutils.py
rename to poky/meta/lib/oe/classutils.py
diff --git a/import-layers/yocto-poky/meta/lib/oe/copy_buildsystem.py b/poky/meta/lib/oe/copy_buildsystem.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oe/copy_buildsystem.py
rename to poky/meta/lib/oe/copy_buildsystem.py
diff --git a/import-layers/yocto-poky/meta/lib/oe/data.py b/poky/meta/lib/oe/data.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oe/data.py
rename to poky/meta/lib/oe/data.py
diff --git a/import-layers/yocto-poky/meta/lib/oe/distro_check.py b/poky/meta/lib/oe/distro_check.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oe/distro_check.py
rename to poky/meta/lib/oe/distro_check.py
diff --git a/import-layers/yocto-poky/meta/lib/oe/gpg_sign.py b/poky/meta/lib/oe/gpg_sign.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oe/gpg_sign.py
rename to poky/meta/lib/oe/gpg_sign.py
diff --git a/import-layers/yocto-poky/meta/lib/oe/license.py b/poky/meta/lib/oe/license.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oe/license.py
rename to poky/meta/lib/oe/license.py
diff --git a/import-layers/yocto-poky/meta/lib/oe/lsb.py b/poky/meta/lib/oe/lsb.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oe/lsb.py
rename to poky/meta/lib/oe/lsb.py
diff --git a/import-layers/yocto-poky/meta/lib/oe/maketype.py b/poky/meta/lib/oe/maketype.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oe/maketype.py
rename to poky/meta/lib/oe/maketype.py
diff --git a/import-layers/yocto-poky/meta/lib/oe/manifest.py b/poky/meta/lib/oe/manifest.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oe/manifest.py
rename to poky/meta/lib/oe/manifest.py
diff --git a/import-layers/yocto-poky/meta/lib/oe/package.py b/poky/meta/lib/oe/package.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oe/package.py
rename to poky/meta/lib/oe/package.py
diff --git a/import-layers/yocto-poky/meta/lib/oe/package_manager.py b/poky/meta/lib/oe/package_manager.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oe/package_manager.py
rename to poky/meta/lib/oe/package_manager.py
diff --git a/import-layers/yocto-poky/meta/lib/oe/packagedata.py b/poky/meta/lib/oe/packagedata.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oe/packagedata.py
rename to poky/meta/lib/oe/packagedata.py
diff --git a/import-layers/yocto-poky/meta/lib/oe/packagegroup.py b/poky/meta/lib/oe/packagegroup.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oe/packagegroup.py
rename to poky/meta/lib/oe/packagegroup.py
diff --git a/import-layers/yocto-poky/meta/lib/oe/patch.py b/poky/meta/lib/oe/patch.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oe/patch.py
rename to poky/meta/lib/oe/patch.py
diff --git a/import-layers/yocto-poky/meta/lib/oe/path.py b/poky/meta/lib/oe/path.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oe/path.py
rename to poky/meta/lib/oe/path.py
diff --git a/import-layers/yocto-poky/meta/lib/oe/prservice.py b/poky/meta/lib/oe/prservice.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oe/prservice.py
rename to poky/meta/lib/oe/prservice.py
diff --git a/import-layers/yocto-poky/meta/lib/oe/qa.py b/poky/meta/lib/oe/qa.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oe/qa.py
rename to poky/meta/lib/oe/qa.py
diff --git a/import-layers/yocto-poky/meta/lib/oe/recipeutils.py b/poky/meta/lib/oe/recipeutils.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oe/recipeutils.py
rename to poky/meta/lib/oe/recipeutils.py
diff --git a/import-layers/yocto-poky/meta/lib/oe/rootfs.py b/poky/meta/lib/oe/rootfs.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oe/rootfs.py
rename to poky/meta/lib/oe/rootfs.py
diff --git a/import-layers/yocto-poky/meta/lib/oe/sdk.py b/poky/meta/lib/oe/sdk.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oe/sdk.py
rename to poky/meta/lib/oe/sdk.py
diff --git a/import-layers/yocto-poky/meta/lib/oe/sstatesig.py b/poky/meta/lib/oe/sstatesig.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oe/sstatesig.py
rename to poky/meta/lib/oe/sstatesig.py
diff --git a/import-layers/yocto-poky/meta/lib/oe/terminal.py b/poky/meta/lib/oe/terminal.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oe/terminal.py
rename to poky/meta/lib/oe/terminal.py
diff --git a/import-layers/yocto-poky/meta/lib/oe/types.py b/poky/meta/lib/oe/types.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oe/types.py
rename to poky/meta/lib/oe/types.py
diff --git a/import-layers/yocto-poky/meta/lib/oe/useradd.py b/poky/meta/lib/oe/useradd.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oe/useradd.py
rename to poky/meta/lib/oe/useradd.py
diff --git a/import-layers/yocto-poky/meta/lib/oe/utils.py b/poky/meta/lib/oe/utils.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oe/utils.py
rename to poky/meta/lib/oe/utils.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/buildperf/__init__.py b/poky/meta/lib/oeqa/buildperf/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/buildperf/__init__.py
rename to poky/meta/lib/oeqa/buildperf/__init__.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/buildperf/base.py b/poky/meta/lib/oeqa/buildperf/base.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/buildperf/base.py
rename to poky/meta/lib/oeqa/buildperf/base.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/buildperf/test_basic.py b/poky/meta/lib/oeqa/buildperf/test_basic.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/buildperf/test_basic.py
rename to poky/meta/lib/oeqa/buildperf/test_basic.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/controllers/__init__.py b/poky/meta/lib/oeqa/controllers/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/controllers/__init__.py
rename to poky/meta/lib/oeqa/controllers/__init__.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/controllers/masterimage.py b/poky/meta/lib/oeqa/controllers/masterimage.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/controllers/masterimage.py
rename to poky/meta/lib/oeqa/controllers/masterimage.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/controllers/testtargetloader.py b/poky/meta/lib/oeqa/controllers/testtargetloader.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/controllers/testtargetloader.py
rename to poky/meta/lib/oeqa/controllers/testtargetloader.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/README b/poky/meta/lib/oeqa/core/README
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/README
rename to poky/meta/lib/oeqa/core/README
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/__init__.py b/poky/meta/lib/oeqa/core/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/__init__.py
rename to poky/meta/lib/oeqa/core/__init__.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/case.py b/poky/meta/lib/oeqa/core/case.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/case.py
rename to poky/meta/lib/oeqa/core/case.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/cases/__init__.py b/poky/meta/lib/oeqa/core/cases/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/cases/__init__.py
rename to poky/meta/lib/oeqa/core/cases/__init__.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/cases/example/data.json b/poky/meta/lib/oeqa/core/cases/example/data.json
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/cases/example/data.json
rename to poky/meta/lib/oeqa/core/cases/example/data.json
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/cases/example/test_basic.py b/poky/meta/lib/oeqa/core/cases/example/test_basic.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/cases/example/test_basic.py
rename to poky/meta/lib/oeqa/core/cases/example/test_basic.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/context.py b/poky/meta/lib/oeqa/core/context.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/context.py
rename to poky/meta/lib/oeqa/core/context.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/decorator/__init__.py b/poky/meta/lib/oeqa/core/decorator/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/decorator/__init__.py
rename to poky/meta/lib/oeqa/core/decorator/__init__.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/decorator/data.py b/poky/meta/lib/oeqa/core/decorator/data.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/decorator/data.py
rename to poky/meta/lib/oeqa/core/decorator/data.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/decorator/depends.py b/poky/meta/lib/oeqa/core/decorator/depends.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/decorator/depends.py
rename to poky/meta/lib/oeqa/core/decorator/depends.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/decorator/oeid.py b/poky/meta/lib/oeqa/core/decorator/oeid.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/decorator/oeid.py
rename to poky/meta/lib/oeqa/core/decorator/oeid.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/decorator/oetag.py b/poky/meta/lib/oeqa/core/decorator/oetag.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/decorator/oetag.py
rename to poky/meta/lib/oeqa/core/decorator/oetag.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/decorator/oetimeout.py b/poky/meta/lib/oeqa/core/decorator/oetimeout.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/decorator/oetimeout.py
rename to poky/meta/lib/oeqa/core/decorator/oetimeout.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/exception.py b/poky/meta/lib/oeqa/core/exception.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/exception.py
rename to poky/meta/lib/oeqa/core/exception.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/loader.py b/poky/meta/lib/oeqa/core/loader.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/loader.py
rename to poky/meta/lib/oeqa/core/loader.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/runner.py b/poky/meta/lib/oeqa/core/runner.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/runner.py
rename to poky/meta/lib/oeqa/core/runner.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/target/__init__.py b/poky/meta/lib/oeqa/core/target/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/target/__init__.py
rename to poky/meta/lib/oeqa/core/target/__init__.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/target/qemu.py b/poky/meta/lib/oeqa/core/target/qemu.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/target/qemu.py
rename to poky/meta/lib/oeqa/core/target/qemu.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/target/ssh.py b/poky/meta/lib/oeqa/core/target/ssh.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/target/ssh.py
rename to poky/meta/lib/oeqa/core/target/ssh.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/tests/__init__.py b/poky/meta/lib/oeqa/core/tests/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/tests/__init__.py
rename to poky/meta/lib/oeqa/core/tests/__init__.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/tests/cases/data.py b/poky/meta/lib/oeqa/core/tests/cases/data.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/tests/cases/data.py
rename to poky/meta/lib/oeqa/core/tests/cases/data.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/tests/cases/depends.py b/poky/meta/lib/oeqa/core/tests/cases/depends.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/tests/cases/depends.py
rename to poky/meta/lib/oeqa/core/tests/cases/depends.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/tests/cases/loader/invalid/oeid.py b/poky/meta/lib/oeqa/core/tests/cases/loader/invalid/oeid.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/tests/cases/loader/invalid/oeid.py
rename to poky/meta/lib/oeqa/core/tests/cases/loader/invalid/oeid.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/tests/cases/loader/threaded/threaded.py b/poky/meta/lib/oeqa/core/tests/cases/loader/threaded/threaded.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/tests/cases/loader/threaded/threaded.py
rename to poky/meta/lib/oeqa/core/tests/cases/loader/threaded/threaded.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/tests/cases/loader/threaded/threaded_alone.py b/poky/meta/lib/oeqa/core/tests/cases/loader/threaded/threaded_alone.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/tests/cases/loader/threaded/threaded_alone.py
rename to poky/meta/lib/oeqa/core/tests/cases/loader/threaded/threaded_alone.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/tests/cases/loader/threaded/threaded_depends.py b/poky/meta/lib/oeqa/core/tests/cases/loader/threaded/threaded_depends.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/tests/cases/loader/threaded/threaded_depends.py
rename to poky/meta/lib/oeqa/core/tests/cases/loader/threaded/threaded_depends.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/tests/cases/loader/threaded/threaded_module.py b/poky/meta/lib/oeqa/core/tests/cases/loader/threaded/threaded_module.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/tests/cases/loader/threaded/threaded_module.py
rename to poky/meta/lib/oeqa/core/tests/cases/loader/threaded/threaded_module.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/tests/cases/loader/valid/another.py b/poky/meta/lib/oeqa/core/tests/cases/loader/valid/another.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/tests/cases/loader/valid/another.py
rename to poky/meta/lib/oeqa/core/tests/cases/loader/valid/another.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/tests/cases/oeid.py b/poky/meta/lib/oeqa/core/tests/cases/oeid.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/tests/cases/oeid.py
rename to poky/meta/lib/oeqa/core/tests/cases/oeid.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/tests/cases/oetag.py b/poky/meta/lib/oeqa/core/tests/cases/oetag.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/tests/cases/oetag.py
rename to poky/meta/lib/oeqa/core/tests/cases/oetag.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/tests/cases/timeout.py b/poky/meta/lib/oeqa/core/tests/cases/timeout.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/tests/cases/timeout.py
rename to poky/meta/lib/oeqa/core/tests/cases/timeout.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/tests/common.py b/poky/meta/lib/oeqa/core/tests/common.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/tests/common.py
rename to poky/meta/lib/oeqa/core/tests/common.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/tests/test_data.py b/poky/meta/lib/oeqa/core/tests/test_data.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/tests/test_data.py
rename to poky/meta/lib/oeqa/core/tests/test_data.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/tests/test_decorators.py b/poky/meta/lib/oeqa/core/tests/test_decorators.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/tests/test_decorators.py
rename to poky/meta/lib/oeqa/core/tests/test_decorators.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/tests/test_loader.py b/poky/meta/lib/oeqa/core/tests/test_loader.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/tests/test_loader.py
rename to poky/meta/lib/oeqa/core/tests/test_loader.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/tests/test_runner.py b/poky/meta/lib/oeqa/core/tests/test_runner.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/tests/test_runner.py
rename to poky/meta/lib/oeqa/core/tests/test_runner.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/threaded.py b/poky/meta/lib/oeqa/core/threaded.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/threaded.py
rename to poky/meta/lib/oeqa/core/threaded.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/utils/__init__.py b/poky/meta/lib/oeqa/core/utils/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/utils/__init__.py
rename to poky/meta/lib/oeqa/core/utils/__init__.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/utils/misc.py b/poky/meta/lib/oeqa/core/utils/misc.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/utils/misc.py
rename to poky/meta/lib/oeqa/core/utils/misc.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/utils/path.py b/poky/meta/lib/oeqa/core/utils/path.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/utils/path.py
rename to poky/meta/lib/oeqa/core/utils/path.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/core/utils/test.py b/poky/meta/lib/oeqa/core/utils/test.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/core/utils/test.py
rename to poky/meta/lib/oeqa/core/utils/test.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/files/test.c b/poky/meta/lib/oeqa/files/test.c
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/files/test.c
rename to poky/meta/lib/oeqa/files/test.c
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/files/test.cpp b/poky/meta/lib/oeqa/files/test.cpp
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/files/test.cpp
rename to poky/meta/lib/oeqa/files/test.cpp
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/files/test.pl b/poky/meta/lib/oeqa/files/test.pl
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/files/test.pl
rename to poky/meta/lib/oeqa/files/test.pl
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/files/test.py b/poky/meta/lib/oeqa/files/test.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/files/test.py
rename to poky/meta/lib/oeqa/files/test.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/oetest.py b/poky/meta/lib/oeqa/oetest.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/oetest.py
rename to poky/meta/lib/oeqa/oetest.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runexported.py b/poky/meta/lib/oeqa/runexported.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runexported.py
rename to poky/meta/lib/oeqa/runexported.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/case.py b/poky/meta/lib/oeqa/runtime/case.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/case.py
rename to poky/meta/lib/oeqa/runtime/case.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/_qemutiny.py b/poky/meta/lib/oeqa/runtime/cases/_qemutiny.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/_qemutiny.py
rename to poky/meta/lib/oeqa/runtime/cases/_qemutiny.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/apt.py b/poky/meta/lib/oeqa/runtime/cases/apt.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/apt.py
rename to poky/meta/lib/oeqa/runtime/cases/apt.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/buildcpio.py b/poky/meta/lib/oeqa/runtime/cases/buildcpio.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/buildcpio.py
rename to poky/meta/lib/oeqa/runtime/cases/buildcpio.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/buildgalculator.py b/poky/meta/lib/oeqa/runtime/cases/buildgalculator.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/buildgalculator.py
rename to poky/meta/lib/oeqa/runtime/cases/buildgalculator.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/buildlzip.py b/poky/meta/lib/oeqa/runtime/cases/buildlzip.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/buildlzip.py
rename to poky/meta/lib/oeqa/runtime/cases/buildlzip.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/connman.py b/poky/meta/lib/oeqa/runtime/cases/connman.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/connman.py
rename to poky/meta/lib/oeqa/runtime/cases/connman.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/date.py b/poky/meta/lib/oeqa/runtime/cases/date.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/date.py
rename to poky/meta/lib/oeqa/runtime/cases/date.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/df.py b/poky/meta/lib/oeqa/runtime/cases/df.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/df.py
rename to poky/meta/lib/oeqa/runtime/cases/df.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/dnf.py b/poky/meta/lib/oeqa/runtime/cases/dnf.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/dnf.py
rename to poky/meta/lib/oeqa/runtime/cases/dnf.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/gcc.py b/poky/meta/lib/oeqa/runtime/cases/gcc.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/gcc.py
rename to poky/meta/lib/oeqa/runtime/cases/gcc.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/gi.py b/poky/meta/lib/oeqa/runtime/cases/gi.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/gi.py
rename to poky/meta/lib/oeqa/runtime/cases/gi.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/kernelmodule.py b/poky/meta/lib/oeqa/runtime/cases/kernelmodule.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/kernelmodule.py
rename to poky/meta/lib/oeqa/runtime/cases/kernelmodule.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/ldd.py b/poky/meta/lib/oeqa/runtime/cases/ldd.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/ldd.py
rename to poky/meta/lib/oeqa/runtime/cases/ldd.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/logrotate.py b/poky/meta/lib/oeqa/runtime/cases/logrotate.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/logrotate.py
rename to poky/meta/lib/oeqa/runtime/cases/logrotate.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/multilib.py b/poky/meta/lib/oeqa/runtime/cases/multilib.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/multilib.py
rename to poky/meta/lib/oeqa/runtime/cases/multilib.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/oe_syslog.py b/poky/meta/lib/oeqa/runtime/cases/oe_syslog.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/oe_syslog.py
rename to poky/meta/lib/oeqa/runtime/cases/oe_syslog.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/opkg.py b/poky/meta/lib/oeqa/runtime/cases/opkg.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/opkg.py
rename to poky/meta/lib/oeqa/runtime/cases/opkg.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/pam.py b/poky/meta/lib/oeqa/runtime/cases/pam.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/pam.py
rename to poky/meta/lib/oeqa/runtime/cases/pam.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/parselogs.py b/poky/meta/lib/oeqa/runtime/cases/parselogs.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/parselogs.py
rename to poky/meta/lib/oeqa/runtime/cases/parselogs.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/perl.py b/poky/meta/lib/oeqa/runtime/cases/perl.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/perl.py
rename to poky/meta/lib/oeqa/runtime/cases/perl.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/ping.py b/poky/meta/lib/oeqa/runtime/cases/ping.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/ping.py
rename to poky/meta/lib/oeqa/runtime/cases/ping.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/ptest.py b/poky/meta/lib/oeqa/runtime/cases/ptest.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/ptest.py
rename to poky/meta/lib/oeqa/runtime/cases/ptest.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/python.py b/poky/meta/lib/oeqa/runtime/cases/python.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/python.py
rename to poky/meta/lib/oeqa/runtime/cases/python.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/rpm.py b/poky/meta/lib/oeqa/runtime/cases/rpm.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/rpm.py
rename to poky/meta/lib/oeqa/runtime/cases/rpm.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/scanelf.py b/poky/meta/lib/oeqa/runtime/cases/scanelf.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/scanelf.py
rename to poky/meta/lib/oeqa/runtime/cases/scanelf.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/scp.py b/poky/meta/lib/oeqa/runtime/cases/scp.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/scp.py
rename to poky/meta/lib/oeqa/runtime/cases/scp.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/skeletoninit.py b/poky/meta/lib/oeqa/runtime/cases/skeletoninit.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/skeletoninit.py
rename to poky/meta/lib/oeqa/runtime/cases/skeletoninit.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/ssh.py b/poky/meta/lib/oeqa/runtime/cases/ssh.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/ssh.py
rename to poky/meta/lib/oeqa/runtime/cases/ssh.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/stap.py b/poky/meta/lib/oeqa/runtime/cases/stap.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/stap.py
rename to poky/meta/lib/oeqa/runtime/cases/stap.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/systemd.py b/poky/meta/lib/oeqa/runtime/cases/systemd.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/systemd.py
rename to poky/meta/lib/oeqa/runtime/cases/systemd.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/x32lib.py b/poky/meta/lib/oeqa/runtime/cases/x32lib.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/x32lib.py
rename to poky/meta/lib/oeqa/runtime/cases/x32lib.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/xorg.py b/poky/meta/lib/oeqa/runtime/cases/xorg.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/cases/xorg.py
rename to poky/meta/lib/oeqa/runtime/cases/xorg.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/context.py b/poky/meta/lib/oeqa/runtime/context.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/context.py
rename to poky/meta/lib/oeqa/runtime/context.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/decorator/package.py b/poky/meta/lib/oeqa/runtime/decorator/package.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/decorator/package.py
rename to poky/meta/lib/oeqa/runtime/decorator/package.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/files/hello.stp b/poky/meta/lib/oeqa/runtime/files/hello.stp
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/files/hello.stp
rename to poky/meta/lib/oeqa/runtime/files/hello.stp
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/files/hellomod.c b/poky/meta/lib/oeqa/runtime/files/hellomod.c
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/files/hellomod.c
rename to poky/meta/lib/oeqa/runtime/files/hellomod.c
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/files/hellomod_makefile b/poky/meta/lib/oeqa/runtime/files/hellomod_makefile
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/files/hellomod_makefile
rename to poky/meta/lib/oeqa/runtime/files/hellomod_makefile
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/files/testmakefile b/poky/meta/lib/oeqa/runtime/files/testmakefile
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/files/testmakefile
rename to poky/meta/lib/oeqa/runtime/files/testmakefile
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/loader.py b/poky/meta/lib/oeqa/runtime/loader.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/loader.py
rename to poky/meta/lib/oeqa/runtime/loader.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/utils/__init__.py b/poky/meta/lib/oeqa/runtime/utils/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/utils/__init__.py
rename to poky/meta/lib/oeqa/runtime/utils/__init__.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/runtime/utils/targetbuildproject.py b/poky/meta/lib/oeqa/runtime/utils/targetbuildproject.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/runtime/utils/targetbuildproject.py
rename to poky/meta/lib/oeqa/runtime/utils/targetbuildproject.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/sdk/__init__.py b/poky/meta/lib/oeqa/sdk/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/sdk/__init__.py
rename to poky/meta/lib/oeqa/sdk/__init__.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/sdk/case.py b/poky/meta/lib/oeqa/sdk/case.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/sdk/case.py
rename to poky/meta/lib/oeqa/sdk/case.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/sdk/cases/buildcpio.py b/poky/meta/lib/oeqa/sdk/cases/buildcpio.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/sdk/cases/buildcpio.py
rename to poky/meta/lib/oeqa/sdk/cases/buildcpio.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/sdk/cases/buildgalculator.py b/poky/meta/lib/oeqa/sdk/cases/buildgalculator.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/sdk/cases/buildgalculator.py
rename to poky/meta/lib/oeqa/sdk/cases/buildgalculator.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/sdk/cases/buildlzip.py b/poky/meta/lib/oeqa/sdk/cases/buildlzip.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/sdk/cases/buildlzip.py
rename to poky/meta/lib/oeqa/sdk/cases/buildlzip.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/sdk/cases/gcc.py b/poky/meta/lib/oeqa/sdk/cases/gcc.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/sdk/cases/gcc.py
rename to poky/meta/lib/oeqa/sdk/cases/gcc.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/sdk/cases/perl.py b/poky/meta/lib/oeqa/sdk/cases/perl.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/sdk/cases/perl.py
rename to poky/meta/lib/oeqa/sdk/cases/perl.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/sdk/cases/python.py b/poky/meta/lib/oeqa/sdk/cases/python.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/sdk/cases/python.py
rename to poky/meta/lib/oeqa/sdk/cases/python.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/sdk/context.py b/poky/meta/lib/oeqa/sdk/context.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/sdk/context.py
rename to poky/meta/lib/oeqa/sdk/context.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/sdk/files/testsdkmakefile b/poky/meta/lib/oeqa/sdk/files/testsdkmakefile
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/sdk/files/testsdkmakefile
rename to poky/meta/lib/oeqa/sdk/files/testsdkmakefile
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/sdk/utils/__init__.py b/poky/meta/lib/oeqa/sdk/utils/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/sdk/utils/__init__.py
rename to poky/meta/lib/oeqa/sdk/utils/__init__.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/sdk/utils/sdkbuildproject.py b/poky/meta/lib/oeqa/sdk/utils/sdkbuildproject.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/sdk/utils/sdkbuildproject.py
rename to poky/meta/lib/oeqa/sdk/utils/sdkbuildproject.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/sdkext/__init__.py b/poky/meta/lib/oeqa/sdkext/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/sdkext/__init__.py
rename to poky/meta/lib/oeqa/sdkext/__init__.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/sdkext/case.py b/poky/meta/lib/oeqa/sdkext/case.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/sdkext/case.py
rename to poky/meta/lib/oeqa/sdkext/case.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/sdkext/cases/devtool.py b/poky/meta/lib/oeqa/sdkext/cases/devtool.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/sdkext/cases/devtool.py
rename to poky/meta/lib/oeqa/sdkext/cases/devtool.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/sdkext/context.py b/poky/meta/lib/oeqa/sdkext/context.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/sdkext/context.py
rename to poky/meta/lib/oeqa/sdkext/context.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/sdkext/files/myapp/Makefile b/poky/meta/lib/oeqa/sdkext/files/myapp/Makefile
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/sdkext/files/myapp/Makefile
rename to poky/meta/lib/oeqa/sdkext/files/myapp/Makefile
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/sdkext/files/myapp/myapp.c b/poky/meta/lib/oeqa/sdkext/files/myapp/myapp.c
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/sdkext/files/myapp/myapp.c
rename to poky/meta/lib/oeqa/sdkext/files/myapp/myapp.c
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/sdkext/files/myapp_cmake/CMakeLists.txt b/poky/meta/lib/oeqa/sdkext/files/myapp_cmake/CMakeLists.txt
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/sdkext/files/myapp_cmake/CMakeLists.txt
rename to poky/meta/lib/oeqa/sdkext/files/myapp_cmake/CMakeLists.txt
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/sdkext/files/myapp_cmake/myapp.c b/poky/meta/lib/oeqa/sdkext/files/myapp_cmake/myapp.c
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/sdkext/files/myapp_cmake/myapp.c
rename to poky/meta/lib/oeqa/sdkext/files/myapp_cmake/myapp.c
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/case.py b/poky/meta/lib/oeqa/selftest/case.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/case.py
rename to poky/meta/lib/oeqa/selftest/case.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/_sstatetests_noauto.py b/poky/meta/lib/oeqa/selftest/cases/_sstatetests_noauto.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/_sstatetests_noauto.py
rename to poky/meta/lib/oeqa/selftest/cases/_sstatetests_noauto.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/archiver.py b/poky/meta/lib/oeqa/selftest/cases/archiver.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/archiver.py
rename to poky/meta/lib/oeqa/selftest/cases/archiver.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/bblayers.py b/poky/meta/lib/oeqa/selftest/cases/bblayers.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/bblayers.py
rename to poky/meta/lib/oeqa/selftest/cases/bblayers.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/bbtests.py b/poky/meta/lib/oeqa/selftest/cases/bbtests.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/bbtests.py
rename to poky/meta/lib/oeqa/selftest/cases/bbtests.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/buildhistory.py b/poky/meta/lib/oeqa/selftest/cases/buildhistory.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/buildhistory.py
rename to poky/meta/lib/oeqa/selftest/cases/buildhistory.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/buildoptions.py b/poky/meta/lib/oeqa/selftest/cases/buildoptions.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/buildoptions.py
rename to poky/meta/lib/oeqa/selftest/cases/buildoptions.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/containerimage.py b/poky/meta/lib/oeqa/selftest/cases/containerimage.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/containerimage.py
rename to poky/meta/lib/oeqa/selftest/cases/containerimage.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/devtool.py b/poky/meta/lib/oeqa/selftest/cases/devtool.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/devtool.py
rename to poky/meta/lib/oeqa/selftest/cases/devtool.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/distrodata.py b/poky/meta/lib/oeqa/selftest/cases/distrodata.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/distrodata.py
rename to poky/meta/lib/oeqa/selftest/cases/distrodata.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/eSDK.py b/poky/meta/lib/oeqa/selftest/cases/eSDK.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/eSDK.py
rename to poky/meta/lib/oeqa/selftest/cases/eSDK.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/efibootpartition.py b/poky/meta/lib/oeqa/selftest/cases/efibootpartition.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/efibootpartition.py
rename to poky/meta/lib/oeqa/selftest/cases/efibootpartition.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/gotoolchain.py b/poky/meta/lib/oeqa/selftest/cases/gotoolchain.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/gotoolchain.py
rename to poky/meta/lib/oeqa/selftest/cases/gotoolchain.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/image_typedep.py b/poky/meta/lib/oeqa/selftest/cases/image_typedep.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/image_typedep.py
rename to poky/meta/lib/oeqa/selftest/cases/image_typedep.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/imagefeatures.py b/poky/meta/lib/oeqa/selftest/cases/imagefeatures.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/imagefeatures.py
rename to poky/meta/lib/oeqa/selftest/cases/imagefeatures.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/layerappend.py b/poky/meta/lib/oeqa/selftest/cases/layerappend.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/layerappend.py
rename to poky/meta/lib/oeqa/selftest/cases/layerappend.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/liboe.py b/poky/meta/lib/oeqa/selftest/cases/liboe.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/liboe.py
rename to poky/meta/lib/oeqa/selftest/cases/liboe.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/lic_checksum.py b/poky/meta/lib/oeqa/selftest/cases/lic_checksum.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/lic_checksum.py
rename to poky/meta/lib/oeqa/selftest/cases/lic_checksum.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/manifest.py b/poky/meta/lib/oeqa/selftest/cases/manifest.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/manifest.py
rename to poky/meta/lib/oeqa/selftest/cases/manifest.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/meta_ide.py b/poky/meta/lib/oeqa/selftest/cases/meta_ide.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/meta_ide.py
rename to poky/meta/lib/oeqa/selftest/cases/meta_ide.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/oelib/__init__.py b/poky/meta/lib/oeqa/selftest/cases/oelib/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/oelib/__init__.py
rename to poky/meta/lib/oeqa/selftest/cases/oelib/__init__.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py b/poky/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py
rename to poky/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/oelib/elf.py b/poky/meta/lib/oeqa/selftest/cases/oelib/elf.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/oelib/elf.py
rename to poky/meta/lib/oeqa/selftest/cases/oelib/elf.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/oelib/license.py b/poky/meta/lib/oeqa/selftest/cases/oelib/license.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/oelib/license.py
rename to poky/meta/lib/oeqa/selftest/cases/oelib/license.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/oelib/path.py b/poky/meta/lib/oeqa/selftest/cases/oelib/path.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/oelib/path.py
rename to poky/meta/lib/oeqa/selftest/cases/oelib/path.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/oelib/types.py b/poky/meta/lib/oeqa/selftest/cases/oelib/types.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/oelib/types.py
rename to poky/meta/lib/oeqa/selftest/cases/oelib/types.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/oelib/utils.py b/poky/meta/lib/oeqa/selftest/cases/oelib/utils.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/oelib/utils.py
rename to poky/meta/lib/oeqa/selftest/cases/oelib/utils.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/oescripts.py b/poky/meta/lib/oeqa/selftest/cases/oescripts.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/oescripts.py
rename to poky/meta/lib/oeqa/selftest/cases/oescripts.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/package.py b/poky/meta/lib/oeqa/selftest/cases/package.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/package.py
rename to poky/meta/lib/oeqa/selftest/cases/package.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/pkgdata.py b/poky/meta/lib/oeqa/selftest/cases/pkgdata.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/pkgdata.py
rename to poky/meta/lib/oeqa/selftest/cases/pkgdata.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/prservice.py b/poky/meta/lib/oeqa/selftest/cases/prservice.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/prservice.py
rename to poky/meta/lib/oeqa/selftest/cases/prservice.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/recipetool.py b/poky/meta/lib/oeqa/selftest/cases/recipetool.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/recipetool.py
rename to poky/meta/lib/oeqa/selftest/cases/recipetool.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/runcmd.py b/poky/meta/lib/oeqa/selftest/cases/runcmd.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/runcmd.py
rename to poky/meta/lib/oeqa/selftest/cases/runcmd.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/runqemu.py b/poky/meta/lib/oeqa/selftest/cases/runqemu.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/runqemu.py
rename to poky/meta/lib/oeqa/selftest/cases/runqemu.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/runtime_test.py b/poky/meta/lib/oeqa/selftest/cases/runtime_test.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/runtime_test.py
rename to poky/meta/lib/oeqa/selftest/cases/runtime_test.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/selftest.py b/poky/meta/lib/oeqa/selftest/cases/selftest.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/selftest.py
rename to poky/meta/lib/oeqa/selftest/cases/selftest.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/signing.py b/poky/meta/lib/oeqa/selftest/cases/signing.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/signing.py
rename to poky/meta/lib/oeqa/selftest/cases/signing.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/sstate.py b/poky/meta/lib/oeqa/selftest/cases/sstate.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/sstate.py
rename to poky/meta/lib/oeqa/selftest/cases/sstate.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/sstatetests.py b/poky/meta/lib/oeqa/selftest/cases/sstatetests.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/sstatetests.py
rename to poky/meta/lib/oeqa/selftest/cases/sstatetests.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/tinfoil.py b/poky/meta/lib/oeqa/selftest/cases/tinfoil.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/tinfoil.py
rename to poky/meta/lib/oeqa/selftest/cases/tinfoil.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/wic.py b/poky/meta/lib/oeqa/selftest/cases/wic.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/cases/wic.py
rename to poky/meta/lib/oeqa/selftest/cases/wic.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/selftest/context.py b/poky/meta/lib/oeqa/selftest/context.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/selftest/context.py
rename to poky/meta/lib/oeqa/selftest/context.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/targetcontrol.py b/poky/meta/lib/oeqa/targetcontrol.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/targetcontrol.py
rename to poky/meta/lib/oeqa/targetcontrol.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/utils/__init__.py b/poky/meta/lib/oeqa/utils/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/utils/__init__.py
rename to poky/meta/lib/oeqa/utils/__init__.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/utils/buildproject.py b/poky/meta/lib/oeqa/utils/buildproject.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/utils/buildproject.py
rename to poky/meta/lib/oeqa/utils/buildproject.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/utils/commands.py b/poky/meta/lib/oeqa/utils/commands.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/utils/commands.py
rename to poky/meta/lib/oeqa/utils/commands.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/utils/decorators.py b/poky/meta/lib/oeqa/utils/decorators.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/utils/decorators.py
rename to poky/meta/lib/oeqa/utils/decorators.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/utils/dump.py b/poky/meta/lib/oeqa/utils/dump.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/utils/dump.py
rename to poky/meta/lib/oeqa/utils/dump.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/utils/ftools.py b/poky/meta/lib/oeqa/utils/ftools.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/utils/ftools.py
rename to poky/meta/lib/oeqa/utils/ftools.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/utils/git.py b/poky/meta/lib/oeqa/utils/git.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/utils/git.py
rename to poky/meta/lib/oeqa/utils/git.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/utils/httpserver.py b/poky/meta/lib/oeqa/utils/httpserver.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/utils/httpserver.py
rename to poky/meta/lib/oeqa/utils/httpserver.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/utils/logparser.py b/poky/meta/lib/oeqa/utils/logparser.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/utils/logparser.py
rename to poky/meta/lib/oeqa/utils/logparser.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/utils/metadata.py b/poky/meta/lib/oeqa/utils/metadata.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/utils/metadata.py
rename to poky/meta/lib/oeqa/utils/metadata.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/utils/network.py b/poky/meta/lib/oeqa/utils/network.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/utils/network.py
rename to poky/meta/lib/oeqa/utils/network.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/utils/package_manager.py b/poky/meta/lib/oeqa/utils/package_manager.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/utils/package_manager.py
rename to poky/meta/lib/oeqa/utils/package_manager.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/utils/qemurunner.py b/poky/meta/lib/oeqa/utils/qemurunner.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/utils/qemurunner.py
rename to poky/meta/lib/oeqa/utils/qemurunner.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/utils/qemutinyrunner.py b/poky/meta/lib/oeqa/utils/qemutinyrunner.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/utils/qemutinyrunner.py
rename to poky/meta/lib/oeqa/utils/qemutinyrunner.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/utils/sshcontrol.py b/poky/meta/lib/oeqa/utils/sshcontrol.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/utils/sshcontrol.py
rename to poky/meta/lib/oeqa/utils/sshcontrol.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/utils/subprocesstweak.py b/poky/meta/lib/oeqa/utils/subprocesstweak.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/utils/subprocesstweak.py
rename to poky/meta/lib/oeqa/utils/subprocesstweak.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/utils/targetbuild.py b/poky/meta/lib/oeqa/utils/targetbuild.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/utils/targetbuild.py
rename to poky/meta/lib/oeqa/utils/targetbuild.py
diff --git a/import-layers/yocto-poky/meta/lib/oeqa/utils/testexport.py b/poky/meta/lib/oeqa/utils/testexport.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/oeqa/utils/testexport.py
rename to poky/meta/lib/oeqa/utils/testexport.py
diff --git a/import-layers/yocto-poky/meta/lib/rootfspostcommands.py b/poky/meta/lib/rootfspostcommands.py
similarity index 100%
rename from import-layers/yocto-poky/meta/lib/rootfspostcommands.py
rename to poky/meta/lib/rootfspostcommands.py
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/acpid/acpid.inc b/poky/meta/recipes-bsp/acpid/acpid.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/acpid/acpid.inc
rename to poky/meta/recipes-bsp/acpid/acpid.inc
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/acpid/acpid/acpid.service b/poky/meta/recipes-bsp/acpid/acpid/acpid.service
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/acpid/acpid/acpid.service
rename to poky/meta/recipes-bsp/acpid/acpid/acpid.service
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/acpid/acpid/init b/poky/meta/recipes-bsp/acpid/acpid/init
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/acpid/acpid/init
rename to poky/meta/recipes-bsp/acpid/acpid/init
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/acpid/acpid_2.0.28.bb b/poky/meta/recipes-bsp/acpid/acpid_2.0.28.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/acpid/acpid_2.0.28.bb
rename to poky/meta/recipes-bsp/acpid/acpid_2.0.28.bb
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/alsa-state/alsa-state.bb b/poky/meta/recipes-bsp/alsa-state/alsa-state.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/alsa-state/alsa-state.bb
rename to poky/meta/recipes-bsp/alsa-state/alsa-state.bb
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/alsa-state/alsa-state/alsa-state-init b/poky/meta/recipes-bsp/alsa-state/alsa-state/alsa-state-init
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/alsa-state/alsa-state/alsa-state-init
rename to poky/meta/recipes-bsp/alsa-state/alsa-state/alsa-state-init
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/alsa-state/alsa-state/asound.conf b/poky/meta/recipes-bsp/alsa-state/alsa-state/asound.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/alsa-state/alsa-state/asound.conf
rename to poky/meta/recipes-bsp/alsa-state/alsa-state/asound.conf
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/alsa-state/alsa-state/asound.state b/poky/meta/recipes-bsp/alsa-state/alsa-state/asound.state
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/alsa-state/alsa-state/asound.state
rename to poky/meta/recipes-bsp/alsa-state/alsa-state/asound.state
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/apmd/apmd/apmd.service b/poky/meta/recipes-bsp/apmd/apmd/apmd.service
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/apmd/apmd/apmd.service
rename to poky/meta/recipes-bsp/apmd/apmd/apmd.service
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/apmd/apmd/apmd_proxy b/poky/meta/recipes-bsp/apmd/apmd/apmd_proxy
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/apmd/apmd/apmd_proxy
rename to poky/meta/recipes-bsp/apmd/apmd/apmd_proxy
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/apmd/apmd/apmd_proxy.conf b/poky/meta/recipes-bsp/apmd/apmd/apmd_proxy.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/apmd/apmd/apmd_proxy.conf
rename to poky/meta/recipes-bsp/apmd/apmd/apmd_proxy.conf
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/apmd/apmd/default b/poky/meta/recipes-bsp/apmd/apmd/default
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/apmd/apmd/default
rename to poky/meta/recipes-bsp/apmd/apmd/default
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/apmd/apmd/init b/poky/meta/recipes-bsp/apmd/apmd/init
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/apmd/apmd/init
rename to poky/meta/recipes-bsp/apmd/apmd/init
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/apmd/apmd/legacy.patch b/poky/meta/recipes-bsp/apmd/apmd/legacy.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/apmd/apmd/legacy.patch
rename to poky/meta/recipes-bsp/apmd/apmd/legacy.patch
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/apmd/apmd/libtool.patch b/poky/meta/recipes-bsp/apmd/apmd/libtool.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/apmd/apmd/libtool.patch
rename to poky/meta/recipes-bsp/apmd/apmd/libtool.patch
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/apmd/apmd/linkage.patch b/poky/meta/recipes-bsp/apmd/apmd/linkage.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/apmd/apmd/linkage.patch
rename to poky/meta/recipes-bsp/apmd/apmd/linkage.patch
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/apmd/apmd/unlinux.patch b/poky/meta/recipes-bsp/apmd/apmd/unlinux.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/apmd/apmd/unlinux.patch
rename to poky/meta/recipes-bsp/apmd/apmd/unlinux.patch
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/apmd/apmd/wexitcode.patch b/poky/meta/recipes-bsp/apmd/apmd/wexitcode.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/apmd/apmd/wexitcode.patch
rename to poky/meta/recipes-bsp/apmd/apmd/wexitcode.patch
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb b/poky/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb
rename to poky/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb b/poky/meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb
rename to poky/meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/eee-acpi-scripts/files/policy-funcs b/poky/meta/recipes-bsp/eee-acpi-scripts/files/policy-funcs
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/eee-acpi-scripts/files/policy-funcs
rename to poky/meta/recipes-bsp/eee-acpi-scripts/files/policy-funcs
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/eee-acpi-scripts/files/powerbtn.patch b/poky/meta/recipes-bsp/eee-acpi-scripts/files/powerbtn.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/eee-acpi-scripts/files/powerbtn.patch
rename to poky/meta/recipes-bsp/eee-acpi-scripts/files/powerbtn.patch
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/eee-acpi-scripts/files/remove-doc-check.patch b/poky/meta/recipes-bsp/eee-acpi-scripts/files/remove-doc-check.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/eee-acpi-scripts/files/remove-doc-check.patch
rename to poky/meta/recipes-bsp/eee-acpi-scripts/files/remove-doc-check.patch
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/formfactor/files/config b/poky/meta/recipes-bsp/formfactor/files/config
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/formfactor/files/config
rename to poky/meta/recipes-bsp/formfactor/files/config
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/formfactor/files/machconfig b/poky/meta/recipes-bsp/formfactor/files/machconfig
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/formfactor/files/machconfig
rename to poky/meta/recipes-bsp/formfactor/files/machconfig
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/formfactor/files/qemuarm/machconfig b/poky/meta/recipes-bsp/formfactor/files/qemuarm/machconfig
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/formfactor/files/qemuarm/machconfig
rename to poky/meta/recipes-bsp/formfactor/files/qemuarm/machconfig
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/formfactor/files/qemuarmv6/machconfig b/poky/meta/recipes-bsp/formfactor/files/qemuarmv6/machconfig
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/formfactor/files/qemuarmv6/machconfig
rename to poky/meta/recipes-bsp/formfactor/files/qemuarmv6/machconfig
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/formfactor/files/qemuarmv7/machconfig b/poky/meta/recipes-bsp/formfactor/files/qemuarmv7/machconfig
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/formfactor/files/qemuarmv7/machconfig
rename to poky/meta/recipes-bsp/formfactor/files/qemuarmv7/machconfig
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/formfactor/files/qemumips/machconfig b/poky/meta/recipes-bsp/formfactor/files/qemumips/machconfig
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/formfactor/files/qemumips/machconfig
rename to poky/meta/recipes-bsp/formfactor/files/qemumips/machconfig
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/formfactor/files/qemumips64/machconfig b/poky/meta/recipes-bsp/formfactor/files/qemumips64/machconfig
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/formfactor/files/qemumips64/machconfig
rename to poky/meta/recipes-bsp/formfactor/files/qemumips64/machconfig
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/formfactor/files/qemuppc/machconfig b/poky/meta/recipes-bsp/formfactor/files/qemuppc/machconfig
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/formfactor/files/qemuppc/machconfig
rename to poky/meta/recipes-bsp/formfactor/files/qemuppc/machconfig
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/formfactor/files/qemux86-64/machconfig b/poky/meta/recipes-bsp/formfactor/files/qemux86-64/machconfig
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/formfactor/files/qemux86-64/machconfig
rename to poky/meta/recipes-bsp/formfactor/files/qemux86-64/machconfig
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/formfactor/files/qemux86/machconfig b/poky/meta/recipes-bsp/formfactor/files/qemux86/machconfig
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/formfactor/files/qemux86/machconfig
rename to poky/meta/recipes-bsp/formfactor/files/qemux86/machconfig
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/formfactor/formfactor_0.0.bb b/poky/meta/recipes-bsp/formfactor/formfactor_0.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/formfactor/formfactor_0.0.bb
rename to poky/meta/recipes-bsp/formfactor/formfactor_0.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/gnu-efi/gnu-efi/gcc46-compatibility.patch b/poky/meta/recipes-bsp/gnu-efi/gnu-efi/gcc46-compatibility.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/gnu-efi/gnu-efi/gcc46-compatibility.patch
rename to poky/meta/recipes-bsp/gnu-efi/gnu-efi/gcc46-compatibility.patch
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/gnu-efi/gnu-efi/lib-Makefile-fix-parallel-issue.patch b/poky/meta/recipes-bsp/gnu-efi/gnu-efi/lib-Makefile-fix-parallel-issue.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/gnu-efi/gnu-efi/lib-Makefile-fix-parallel-issue.patch
rename to poky/meta/recipes-bsp/gnu-efi/gnu-efi/lib-Makefile-fix-parallel-issue.patch
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch b/poky/meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch
rename to poky/meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.6.bb b/poky/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.6.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.6.bb
rename to poky/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.6.bb
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/grub/files/0001-Disable-mfpmath-sse-as-well-when-SSE-is-disabled.patch b/poky/meta/recipes-bsp/grub/files/0001-Disable-mfpmath-sse-as-well-when-SSE-is-disabled.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/grub/files/0001-Disable-mfpmath-sse-as-well-when-SSE-is-disabled.patch
rename to poky/meta/recipes-bsp/grub/files/0001-Disable-mfpmath-sse-as-well-when-SSE-is-disabled.patch
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/grub/files/0001-Unset-need_charset_alias-when-building-for-musl.patch b/poky/meta/recipes-bsp/grub/files/0001-Unset-need_charset_alias-when-building-for-musl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/grub/files/0001-Unset-need_charset_alias-when-building-for-musl.patch
rename to poky/meta/recipes-bsp/grub/files/0001-Unset-need_charset_alias-when-building-for-musl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/grub/files/0001-grub.d-10_linux.in-add-oe-s-kernel-name.patch b/poky/meta/recipes-bsp/grub/files/0001-grub.d-10_linux.in-add-oe-s-kernel-name.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/grub/files/0001-grub.d-10_linux.in-add-oe-s-kernel-name.patch
rename to poky/meta/recipes-bsp/grub/files/0001-grub.d-10_linux.in-add-oe-s-kernel-name.patch
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/grub/files/autogen.sh-exclude-pc.patch b/poky/meta/recipes-bsp/grub/files/autogen.sh-exclude-pc.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/grub/files/autogen.sh-exclude-pc.patch
rename to poky/meta/recipes-bsp/grub/files/autogen.sh-exclude-pc.patch
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/grub/files/cfg b/poky/meta/recipes-bsp/grub/files/cfg
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/grub/files/cfg
rename to poky/meta/recipes-bsp/grub/files/cfg
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/grub/files/fix.build.with.gcc-7.patch b/poky/meta/recipes-bsp/grub/files/fix.build.with.gcc-7.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/grub/files/fix.build.with.gcc-7.patch
rename to poky/meta/recipes-bsp/grub/files/fix.build.with.gcc-7.patch
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/grub/files/gcc8.patch b/poky/meta/recipes-bsp/grub/files/gcc8.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/grub/files/gcc8.patch
rename to poky/meta/recipes-bsp/grub/files/gcc8.patch
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/grub/files/grub-module-explicitly-keeps-symbole-.module_license.patch b/poky/meta/recipes-bsp/grub/files/grub-module-explicitly-keeps-symbole-.module_license.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/grub/files/grub-module-explicitly-keeps-symbole-.module_license.patch
rename to poky/meta/recipes-bsp/grub/files/grub-module-explicitly-keeps-symbole-.module_license.patch
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/grub/grub-bootconf_1.00.bb b/poky/meta/recipes-bsp/grub/grub-bootconf_1.00.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/grub/grub-bootconf_1.00.bb
rename to poky/meta/recipes-bsp/grub/grub-bootconf_1.00.bb
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/grub/grub-efi_2.02.bb b/poky/meta/recipes-bsp/grub/grub-efi_2.02.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/grub/grub-efi_2.02.bb
rename to poky/meta/recipes-bsp/grub/grub-efi_2.02.bb
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/grub/grub2.inc b/poky/meta/recipes-bsp/grub/grub2.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/grub/grub2.inc
rename to poky/meta/recipes-bsp/grub/grub2.inc
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/grub/grub_2.02.bb b/poky/meta/recipes-bsp/grub/grub_2.02.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/grub/grub_2.02.bb
rename to poky/meta/recipes-bsp/grub/grub_2.02.bb
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/keymaps/files/GPLv2.patch b/poky/meta/recipes-bsp/keymaps/files/GPLv2.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/keymaps/files/GPLv2.patch
rename to poky/meta/recipes-bsp/keymaps/files/GPLv2.patch
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/keymaps/files/keymap.sh b/poky/meta/recipes-bsp/keymaps/files/keymap.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/keymaps/files/keymap.sh
rename to poky/meta/recipes-bsp/keymaps/files/keymap.sh
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/keymaps/keymaps_1.0.bb b/poky/meta/recipes-bsp/keymaps/keymaps_1.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/keymaps/keymaps_1.0.bb
rename to poky/meta/recipes-bsp/keymaps/keymaps_1.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/libacpi/files/ldflags.patch b/poky/meta/recipes-bsp/libacpi/files/ldflags.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/libacpi/files/ldflags.patch
rename to poky/meta/recipes-bsp/libacpi/files/ldflags.patch
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch b/poky/meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch
rename to poky/meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/libacpi/files/makefile-fix.patch b/poky/meta/recipes-bsp/libacpi/files/makefile-fix.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/libacpi/files/makefile-fix.patch
rename to poky/meta/recipes-bsp/libacpi/files/makefile-fix.patch
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/libacpi/files/use_correct_strip_in_cross_environment.patch b/poky/meta/recipes-bsp/libacpi/files/use_correct_strip_in_cross_environment.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/libacpi/files/use_correct_strip_in_cross_environment.patch
rename to poky/meta/recipes-bsp/libacpi/files/use_correct_strip_in_cross_environment.patch
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/libacpi/libacpi_0.2.bb b/poky/meta/recipes-bsp/libacpi/libacpi_0.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/libacpi/libacpi_0.2.bb
rename to poky/meta/recipes-bsp/libacpi/libacpi_0.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/acdefine.patch b/poky/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/acdefine.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/acdefine.patch
rename to poky/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/acdefine.patch
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/autotools.patch b/poky/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/autotools.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/autotools.patch
rename to poky/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/autotools.patch
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/gettext.patch b/poky/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/gettext.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/gettext.patch
rename to poky/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/gettext.patch
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz-check-locale.h.patch b/poky/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz-check-locale.h.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz-check-locale.h.patch
rename to poky/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz-check-locale.h.patch
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz_fix_for_automake-1.12.patch b/poky/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz_fix_for_automake-1.12.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz_fix_for_automake-1.12.patch
rename to poky/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/lrzsz_fix_for_automake-1.12.patch
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/makefile.patch b/poky/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/makefile.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/makefile.patch
rename to poky/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/makefile.patch
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb b/poky/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb
rename to poky/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/pciutils/pciutils/configure.patch b/poky/meta/recipes-bsp/pciutils/pciutils/configure.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/pciutils/pciutils/configure.patch
rename to poky/meta/recipes-bsp/pciutils/pciutils/configure.patch
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/pciutils/pciutils_3.5.6.bb b/poky/meta/recipes-bsp/pciutils/pciutils_3.5.6.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/pciutils/pciutils_3.5.6.bb
rename to poky/meta/recipes-bsp/pciutils/pciutils_3.5.6.bb
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/pcmciautils/pcmciautils-018/lex_sys_types.patch b/poky/meta/recipes-bsp/pcmciautils/pcmciautils-018/lex_sys_types.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/pcmciautils/pcmciautils-018/lex_sys_types.patch
rename to poky/meta/recipes-bsp/pcmciautils/pcmciautils-018/lex_sys_types.patch
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_fix.patch b/poky/meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_fix.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_fix.patch
rename to poky/meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_fix.patch
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_race.patch b/poky/meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_race.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_race.patch
rename to poky/meta/recipes-bsp/pcmciautils/pcmciautils-018/makefile_race.patch
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/pcmciautils/pcmciautils.inc b/poky/meta/recipes-bsp/pcmciautils/pcmciautils.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/pcmciautils/pcmciautils.inc
rename to poky/meta/recipes-bsp/pcmciautils/pcmciautils.inc
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb b/poky/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb
rename to poky/meta/recipes-bsp/pcmciautils/pcmciautils_018.bb
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb b/poky/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb
rename to poky/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/setserial/setserial/add_stdlib.patch b/poky/meta/recipes-bsp/setserial/setserial/add_stdlib.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/setserial/setserial/add_stdlib.patch
rename to poky/meta/recipes-bsp/setserial/setserial/add_stdlib.patch
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/setserial/setserial/ldflags.patch b/poky/meta/recipes-bsp/setserial/setserial/ldflags.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/setserial/setserial/ldflags.patch
rename to poky/meta/recipes-bsp/setserial/setserial/ldflags.patch
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/setserial/setserial_2.17.bb b/poky/meta/recipes-bsp/setserial/setserial_2.17.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/setserial/setserial_2.17.bb
rename to poky/meta/recipes-bsp/setserial/setserial_2.17.bb
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch b/poky/meta/recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch
rename to poky/meta/recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot-common_2018.01.inc b/poky/meta/recipes-bsp/u-boot/u-boot-common_2018.01.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot-common_2018.01.inc
rename to poky/meta/recipes-bsp/u-boot/u-boot-common_2018.01.inc
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.01.bb b/poky/meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.01.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.01.bb
rename to poky/meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.01.bb
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot-mkimage_2018.01.bb b/poky/meta/recipes-bsp/u-boot/u-boot-mkimage_2018.01.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot-mkimage_2018.01.bb
rename to poky/meta/recipes-bsp/u-boot/u-boot-mkimage_2018.01.bb
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot.inc b/poky/meta/recipes-bsp/u-boot/u-boot.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot.inc
rename to poky/meta/recipes-bsp/u-boot/u-boot.inc
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot_2018.01.bb b/poky/meta/recipes-bsp/u-boot/u-boot_2018.01.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/u-boot/u-boot_2018.01.bb
rename to poky/meta/recipes-bsp/u-boot/u-boot_2018.01.bb
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/usbinit/usbinit.bb b/poky/meta/recipes-bsp/usbinit/usbinit.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/usbinit/usbinit.bb
rename to poky/meta/recipes-bsp/usbinit/usbinit.bb
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/usbinit/usbinit/COPYING.GPL b/poky/meta/recipes-bsp/usbinit/usbinit/COPYING.GPL
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/usbinit/usbinit/COPYING.GPL
rename to poky/meta/recipes-bsp/usbinit/usbinit/COPYING.GPL
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/usbinit/usbinit/usb-gether b/poky/meta/recipes-bsp/usbinit/usbinit/usb-gether
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/usbinit/usbinit/usb-gether
rename to poky/meta/recipes-bsp/usbinit/usbinit/usb-gether
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/usbutils/usbutils/usb-devices-avoid-dependency-on-bash.patch b/poky/meta/recipes-bsp/usbutils/usbutils/usb-devices-avoid-dependency-on-bash.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/usbutils/usbutils/usb-devices-avoid-dependency-on-bash.patch
rename to poky/meta/recipes-bsp/usbutils/usbutils/usb-devices-avoid-dependency-on-bash.patch
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/usbutils/usbutils_009.bb b/poky/meta/recipes-bsp/usbutils/usbutils_009.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/usbutils/usbutils_009.bb
rename to poky/meta/recipes-bsp/usbutils/usbutils_009.bb
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/v86d/v86d/Update-x86emu-from-X.org.patch b/poky/meta/recipes-bsp/v86d/v86d/Update-x86emu-from-X.org.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/v86d/v86d/Update-x86emu-from-X.org.patch
rename to poky/meta/recipes-bsp/v86d/v86d/Update-x86emu-from-X.org.patch
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/v86d/v86d/aarch64-host.patch b/poky/meta/recipes-bsp/v86d/v86d/aarch64-host.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/v86d/v86d/aarch64-host.patch
rename to poky/meta/recipes-bsp/v86d/v86d/aarch64-host.patch
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/v86d/v86d/ar-from-env.patch b/poky/meta/recipes-bsp/v86d/v86d/ar-from-env.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/v86d/v86d/ar-from-env.patch
rename to poky/meta/recipes-bsp/v86d/v86d/ar-from-env.patch
diff --git a/import-layers/yocto-poky/meta/recipes-bsp/v86d/v86d_0.1.10.bb b/poky/meta/recipes-bsp/v86d/v86d_0.1.10.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-bsp/v86d/v86d_0.1.10.bb
rename to poky/meta/recipes-bsp/v86d/v86d_0.1.10.bb
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb b/poky/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb
rename to poky/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/avahi/avahi.inc b/poky/meta/recipes-connectivity/avahi/avahi.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/avahi/avahi.inc
rename to poky/meta/recipes-connectivity/avahi/avahi.inc
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/avahi/avahi_0.7.bb b/poky/meta/recipes-connectivity/avahi/avahi_0.7.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/avahi/avahi_0.7.bb
rename to poky/meta/recipes-connectivity/avahi/avahi_0.7.bb
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/avahi/files/00avahi-autoipd b/poky/meta/recipes-connectivity/avahi/files/00avahi-autoipd
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/avahi/files/00avahi-autoipd
rename to poky/meta/recipes-connectivity/avahi/files/00avahi-autoipd
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/avahi/files/99avahi-autoipd b/poky/meta/recipes-connectivity/avahi/files/99avahi-autoipd
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/avahi/files/99avahi-autoipd
rename to poky/meta/recipes-connectivity/avahi/files/99avahi-autoipd
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/avahi/files/initscript.patch b/poky/meta/recipes-connectivity/avahi/files/initscript.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/avahi/files/initscript.patch
rename to poky/meta/recipes-connectivity/avahi/files/initscript.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/bind/bind/0001-build-use-pkg-config-to-find-libxml2.patch b/poky/meta/recipes-connectivity/bind/bind/0001-build-use-pkg-config-to-find-libxml2.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/bind/bind/0001-build-use-pkg-config-to-find-libxml2.patch
rename to poky/meta/recipes-connectivity/bind/bind/0001-build-use-pkg-config-to-find-libxml2.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/bind/bind/0001-gen.c-extend-DIRNAMESIZE-from-256-to-512.patch b/poky/meta/recipes-connectivity/bind/bind/0001-gen.c-extend-DIRNAMESIZE-from-256-to-512.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/bind/bind/0001-gen.c-extend-DIRNAMESIZE-from-256-to-512.patch
rename to poky/meta/recipes-connectivity/bind/bind/0001-gen.c-extend-DIRNAMESIZE-from-256-to-512.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/bind/bind/0001-lib-dns-gen.c-fix-too-long-error.patch b/poky/meta/recipes-connectivity/bind/bind/0001-lib-dns-gen.c-fix-too-long-error.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/bind/bind/0001-lib-dns-gen.c-fix-too-long-error.patch
rename to poky/meta/recipes-connectivity/bind/bind/0001-lib-dns-gen.c-fix-too-long-error.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/bind/bind/bind-confgen-build-unix.o-once.patch b/poky/meta/recipes-connectivity/bind/bind/bind-confgen-build-unix.o-once.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/bind/bind/bind-confgen-build-unix.o-once.patch
rename to poky/meta/recipes-connectivity/bind/bind/bind-confgen-build-unix.o-once.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch b/poky/meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch
rename to poky/meta/recipes-connectivity/bind/bind/bind-ensure-searching-for-json-headers-searches-sysr.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/bind/bind/bind9 b/poky/meta/recipes-connectivity/bind/bind/bind9
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/bind/bind/bind9
rename to poky/meta/recipes-connectivity/bind/bind/bind9
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/bind/bind/conf.patch b/poky/meta/recipes-connectivity/bind/bind/conf.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/bind/bind/conf.patch
rename to poky/meta/recipes-connectivity/bind/bind/conf.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/bind/bind/dont-test-on-host.patch b/poky/meta/recipes-connectivity/bind/bind/dont-test-on-host.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/bind/bind/dont-test-on-host.patch
rename to poky/meta/recipes-connectivity/bind/bind/dont-test-on-host.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/bind/bind/generate-rndc-key.sh b/poky/meta/recipes-connectivity/bind/bind/generate-rndc-key.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/bind/bind/generate-rndc-key.sh
rename to poky/meta/recipes-connectivity/bind/bind/generate-rndc-key.sh
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/bind/bind/init.d-add-support-for-read-only-rootfs.patch b/poky/meta/recipes-connectivity/bind/bind/init.d-add-support-for-read-only-rootfs.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/bind/bind/init.d-add-support-for-read-only-rootfs.patch
rename to poky/meta/recipes-connectivity/bind/bind/init.d-add-support-for-read-only-rootfs.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/bind/bind/make-etc-initd-bind-stop-work.patch b/poky/meta/recipes-connectivity/bind/bind/make-etc-initd-bind-stop-work.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/bind/bind/make-etc-initd-bind-stop-work.patch
rename to poky/meta/recipes-connectivity/bind/bind/make-etc-initd-bind-stop-work.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/bind/bind/named.service b/poky/meta/recipes-connectivity/bind/bind/named.service
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/bind/bind/named.service
rename to poky/meta/recipes-connectivity/bind/bind/named.service
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/bind/bind/use-python3-and-fix-install-lib-path.patch b/poky/meta/recipes-connectivity/bind/bind/use-python3-and-fix-install-lib-path.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/bind/bind/use-python3-and-fix-install-lib-path.patch
rename to poky/meta/recipes-connectivity/bind/bind/use-python3-and-fix-install-lib-path.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/bind/bind_9.10.6.bb b/poky/meta/recipes-connectivity/bind/bind_9.10.6.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/bind/bind_9.10.6.bb
rename to poky/meta/recipes-connectivity/bind/bind_9.10.6.bb
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/bluez5/bluez5.inc b/poky/meta/recipes-connectivity/bluez5/bluez5.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/bluez5/bluez5.inc
rename to poky/meta/recipes-connectivity/bluez5/bluez5.inc
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/bluez5/bluez5/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch b/poky/meta/recipes-connectivity/bluez5/bluez5/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/bluez5/bluez5/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
rename to poky/meta/recipes-connectivity/bluez5/bluez5/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/bluez5/bluez5/0001-tests-add-a-target-for-building-tests-without-runnin.patch b/poky/meta/recipes-connectivity/bluez5/bluez5/0001-tests-add-a-target-for-building-tests-without-runnin.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/bluez5/bluez5/0001-tests-add-a-target-for-building-tests-without-runnin.patch
rename to poky/meta/recipes-connectivity/bluez5/bluez5/0001-tests-add-a-target-for-building-tests-without-runnin.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/bluez5/bluez5/init b/poky/meta/recipes-connectivity/bluez5/bluez5/init
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/bluez5/bluez5/init
rename to poky/meta/recipes-connectivity/bluez5/bluez5/init
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/bluez5/bluez5/out-of-tree.patch b/poky/meta/recipes-connectivity/bluez5/bluez5/out-of-tree.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/bluez5/bluez5/out-of-tree.patch
rename to poky/meta/recipes-connectivity/bluez5/bluez5/out-of-tree.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/bluez5/bluez5/run-ptest b/poky/meta/recipes-connectivity/bluez5/bluez5/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/bluez5/bluez5/run-ptest
rename to poky/meta/recipes-connectivity/bluez5/bluez5/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/bluez5/bluez5_5.48.bb b/poky/meta/recipes-connectivity/bluez5/bluez5_5.48.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/bluez5/bluez5_5.48.bb
rename to poky/meta/recipes-connectivity/bluez5/bluez5_5.48.bb
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/connman/connman-conf.bb b/poky/meta/recipes-connectivity/connman/connman-conf.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/connman/connman-conf.bb
rename to poky/meta/recipes-connectivity/connman/connman-conf.bb
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/connman/connman-conf/qemuall/wired-connection.service b/poky/meta/recipes-connectivity/connman/connman-conf/qemuall/wired-connection.service
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/connman/connman-conf/qemuall/wired-connection.service
rename to poky/meta/recipes-connectivity/connman/connman-conf/qemuall/wired-connection.service
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/connman/connman-conf/qemuall/wired-setup b/poky/meta/recipes-connectivity/connman/connman-conf/qemuall/wired-setup
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/connman/connman-conf/qemuall/wired-setup
rename to poky/meta/recipes-connectivity/connman/connman-conf/qemuall/wired-setup
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/connman/connman-conf/qemuall/wired.config b/poky/meta/recipes-connectivity/connman/connman-conf/qemuall/wired.config
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/connman/connman-conf/qemuall/wired.config
rename to poky/meta/recipes-connectivity/connman/connman-conf/qemuall/wired.config
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/connman/connman-gnome/0001-Port-to-Gtk3.patch b/poky/meta/recipes-connectivity/connman/connman-gnome/0001-Port-to-Gtk3.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/connman/connman-gnome/0001-Port-to-Gtk3.patch
rename to poky/meta/recipes-connectivity/connman/connman-gnome/0001-Port-to-Gtk3.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/connman/connman-gnome/0001-Removed-icon-from-connman-gnome-about-applet.patch b/poky/meta/recipes-connectivity/connman/connman-gnome/0001-Removed-icon-from-connman-gnome-about-applet.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/connman/connman-gnome/0001-Removed-icon-from-connman-gnome-about-applet.patch
rename to poky/meta/recipes-connectivity/connman/connman-gnome/0001-Removed-icon-from-connman-gnome-about-applet.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/connman/connman-gnome/connman-gnome-fix-dbus-interface-name.patch b/poky/meta/recipes-connectivity/connman/connman-gnome/connman-gnome-fix-dbus-interface-name.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/connman/connman-gnome/connman-gnome-fix-dbus-interface-name.patch
rename to poky/meta/recipes-connectivity/connman/connman-gnome/connman-gnome-fix-dbus-interface-name.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-01.png b/poky/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-01.png
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-01.png
rename to poky/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-01.png
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-02.png b/poky/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-02.png
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-02.png
rename to poky/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-02.png
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-03.png b/poky/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-03.png
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-03.png
rename to poky/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-03.png
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-04.png b/poky/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-04.png
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-04.png
rename to poky/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-04.png
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-05.png b/poky/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-05.png
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-05.png
rename to poky/meta/recipes-connectivity/connman/connman-gnome/images/connman-signal-05.png
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/connman/connman-gnome/null_check_for_ipv4_config.patch b/poky/meta/recipes-connectivity/connman/connman-gnome/null_check_for_ipv4_config.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/connman/connman-gnome/null_check_for_ipv4_config.patch
rename to poky/meta/recipes-connectivity/connman/connman-gnome/null_check_for_ipv4_config.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/connman/connman-gnome_0.7.bb b/poky/meta/recipes-connectivity/connman/connman-gnome_0.7.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/connman/connman-gnome_0.7.bb
rename to poky/meta/recipes-connectivity/connman/connman-gnome_0.7.bb
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/connman/connman.inc b/poky/meta/recipes-connectivity/connman/connman.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/connman/connman.inc
rename to poky/meta/recipes-connectivity/connman/connman.inc
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-resolved-when-we-use-co.patch b/poky/meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-resolved-when-we-use-co.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-resolved-when-we-use-co.patch
rename to poky/meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-resolved-when-we-use-co.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/connman/connman/0001-giognutls-Fix-a-crash-using-wispr-over-TLS.patch b/poky/meta/recipes-connectivity/connman/connman/0001-giognutls-Fix-a-crash-using-wispr-over-TLS.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/connman/connman/0001-giognutls-Fix-a-crash-using-wispr-over-TLS.patch
rename to poky/meta/recipes-connectivity/connman/connman/0001-giognutls-Fix-a-crash-using-wispr-over-TLS.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/connman/connman/0001-inet-Add-prefixlen-to-iproute_default_function.patch b/poky/meta/recipes-connectivity/connman/connman/0001-inet-Add-prefixlen-to-iproute_default_function.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/connman/connman/0001-inet-Add-prefixlen-to-iproute_default_function.patch
rename to poky/meta/recipes-connectivity/connman/connman/0001-inet-Add-prefixlen-to-iproute_default_function.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/connman/connman/0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch b/poky/meta/recipes-connectivity/connman/connman/0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/connman/connman/0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch
rename to poky/meta/recipes-connectivity/connman/connman/0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/connman/connman/0001-session-Keep-track-of-addr-in-fw_snat-session.patch b/poky/meta/recipes-connectivity/connman/connman/0001-session-Keep-track-of-addr-in-fw_snat-session.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/connman/connman/0001-session-Keep-track-of-addr-in-fw_snat-session.patch
rename to poky/meta/recipes-connectivity/connman/connman/0001-session-Keep-track-of-addr-in-fw_snat-session.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/connman/connman/0002-inet-Implement-subnet-route-creation-deletion-in-ipr.patch b/poky/meta/recipes-connectivity/connman/connman/0002-inet-Implement-subnet-route-creation-deletion-in-ipr.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/connman/connman/0002-inet-Implement-subnet-route-creation-deletion-in-ipr.patch
rename to poky/meta/recipes-connectivity/connman/connman/0002-inet-Implement-subnet-route-creation-deletion-in-ipr.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch b/poky/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
rename to poky/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/connman/connman/0003-inet-Implement-APIs-for-creating-and-deleting-subnet.patch b/poky/meta/recipes-connectivity/connman/connman/0003-inet-Implement-APIs-for-creating-and-deleting-subnet.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/connman/connman/0003-inet-Implement-APIs-for-creating-and-deleting-subnet.patch
rename to poky/meta/recipes-connectivity/connman/connman/0003-inet-Implement-APIs-for-creating-and-deleting-subnet.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/connman/connman/0004-session-Use-subnet-route-creation-and-deletion-APIs.patch b/poky/meta/recipes-connectivity/connman/connman/0004-session-Use-subnet-route-creation-and-deletion-APIs.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/connman/connman/0004-session-Use-subnet-route-creation-and-deletion-APIs.patch
rename to poky/meta/recipes-connectivity/connman/connman/0004-session-Use-subnet-route-creation-and-deletion-APIs.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/connman/connman/connman b/poky/meta/recipes-connectivity/connman/connman/connman
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/connman/connman/connman
rename to poky/meta/recipes-connectivity/connman/connman/connman
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/connman/connman/includes.patch b/poky/meta/recipes-connectivity/connman/connman/includes.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/connman/connman/includes.patch
rename to poky/meta/recipes-connectivity/connman/connman/includes.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/connman/connman/no-version-scripts.patch b/poky/meta/recipes-connectivity/connman/connman/no-version-scripts.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/connman/connman/no-version-scripts.patch
rename to poky/meta/recipes-connectivity/connman/connman/no-version-scripts.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/connman/connman_1.35.bb b/poky/meta/recipes-connectivity/connman/connman_1.35.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/connman/connman_1.35.bb
rename to poky/meta/recipes-connectivity/connman/connman_1.35.bb
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/dhcp/dhcp.inc b/poky/meta/recipes-connectivity/dhcp/dhcp.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/dhcp/dhcp.inc
rename to poky/meta/recipes-connectivity/dhcp/dhcp.inc
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/dhcp/dhcp/0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch b/poky/meta/recipes-connectivity/dhcp/dhcp/0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/dhcp/dhcp/0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch
rename to poky/meta/recipes-connectivity/dhcp/dhcp/0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch b/poky/meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch
rename to poky/meta/recipes-connectivity/dhcp/dhcp/0002-dhclient-dbus.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/dhcp/dhcp/0003-link-with-lcrypto.patch b/poky/meta/recipes-connectivity/dhcp/dhcp/0003-link-with-lcrypto.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/dhcp/dhcp/0003-link-with-lcrypto.patch
rename to poky/meta/recipes-connectivity/dhcp/dhcp/0003-link-with-lcrypto.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch b/poky/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch
rename to poky/meta/recipes-connectivity/dhcp/dhcp/0004-Fix-out-of-tree-builds.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/dhcp/dhcp/0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch b/poky/meta/recipes-connectivity/dhcp/dhcp/0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/dhcp/dhcp/0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch
rename to poky/meta/recipes-connectivity/dhcp/dhcp/0005-dhcp-client-fix-invoke-dhclient-script-failed-on-Rea.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/dhcp/dhcp/0006-site.h-enable-gentle-shutdown.patch b/poky/meta/recipes-connectivity/dhcp/dhcp/0006-site.h-enable-gentle-shutdown.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/dhcp/dhcp/0006-site.h-enable-gentle-shutdown.patch
rename to poky/meta/recipes-connectivity/dhcp/dhcp/0006-site.h-enable-gentle-shutdown.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch b/poky/meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch
rename to poky/meta/recipes-connectivity/dhcp/dhcp/0007-Add-configure-argument-to-make-the-libxml2-dependenc.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/dhcp/dhcp/0008-tweak-to-support-external-bind.patch b/poky/meta/recipes-connectivity/dhcp/dhcp/0008-tweak-to-support-external-bind.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/dhcp/dhcp/0008-tweak-to-support-external-bind.patch
rename to poky/meta/recipes-connectivity/dhcp/dhcp/0008-tweak-to-support-external-bind.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/dhcp/dhcp/0009-remove-dhclient-script-bash-dependency.patch b/poky/meta/recipes-connectivity/dhcp/dhcp/0009-remove-dhclient-script-bash-dependency.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/dhcp/dhcp/0009-remove-dhclient-script-bash-dependency.patch
rename to poky/meta/recipes-connectivity/dhcp/dhcp/0009-remove-dhclient-script-bash-dependency.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/dhcp/dhcp/0010-build-shared-libs.patch b/poky/meta/recipes-connectivity/dhcp/dhcp/0010-build-shared-libs.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/dhcp/dhcp/0010-build-shared-libs.patch
rename to poky/meta/recipes-connectivity/dhcp/dhcp/0010-build-shared-libs.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/dhcp/dhcp/0011-Moved-the-call-to-isc_app_ctxstart-to-not-get-signal.patch b/poky/meta/recipes-connectivity/dhcp/dhcp/0011-Moved-the-call-to-isc_app_ctxstart-to-not-get-signal.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/dhcp/dhcp/0011-Moved-the-call-to-isc_app_ctxstart-to-not-get-signal.patch
rename to poky/meta/recipes-connectivity/dhcp/dhcp/0011-Moved-the-call-to-isc_app_ctxstart-to-not-get-signal.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/dhcp/dhcp/0012-dhcp-correct-the-intention-for-xml2-lib-search.patch b/poky/meta/recipes-connectivity/dhcp/dhcp/0012-dhcp-correct-the-intention-for-xml2-lib-search.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/dhcp/dhcp/0012-dhcp-correct-the-intention-for-xml2-lib-search.patch
rename to poky/meta/recipes-connectivity/dhcp/dhcp/0012-dhcp-correct-the-intention-for-xml2-lib-search.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/dhcp/dhcp/CVE-2017-3144.patch b/poky/meta/recipes-connectivity/dhcp/dhcp/CVE-2017-3144.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/dhcp/dhcp/CVE-2017-3144.patch
rename to poky/meta/recipes-connectivity/dhcp/dhcp/CVE-2017-3144.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/dhcp/dhcp_4.3.6.bb b/poky/meta/recipes-connectivity/dhcp/dhcp_4.3.6.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/dhcp/dhcp_4.3.6.bb
rename to poky/meta/recipes-connectivity/dhcp/dhcp_4.3.6.bb
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/dhcp/files/default-relay b/poky/meta/recipes-connectivity/dhcp/files/default-relay
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/dhcp/files/default-relay
rename to poky/meta/recipes-connectivity/dhcp/files/default-relay
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/dhcp/files/default-server b/poky/meta/recipes-connectivity/dhcp/files/default-server
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/dhcp/files/default-server
rename to poky/meta/recipes-connectivity/dhcp/files/default-server
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/dhcp/files/dhclient-systemd-wrapper b/poky/meta/recipes-connectivity/dhcp/files/dhclient-systemd-wrapper
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/dhcp/files/dhclient-systemd-wrapper
rename to poky/meta/recipes-connectivity/dhcp/files/dhclient-systemd-wrapper
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/dhcp/files/dhclient.conf b/poky/meta/recipes-connectivity/dhcp/files/dhclient.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/dhcp/files/dhclient.conf
rename to poky/meta/recipes-connectivity/dhcp/files/dhclient.conf
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/dhcp/files/dhclient.service b/poky/meta/recipes-connectivity/dhcp/files/dhclient.service
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/dhcp/files/dhclient.service
rename to poky/meta/recipes-connectivity/dhcp/files/dhclient.service
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/dhcp/files/dhcpd.conf b/poky/meta/recipes-connectivity/dhcp/files/dhcpd.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/dhcp/files/dhcpd.conf
rename to poky/meta/recipes-connectivity/dhcp/files/dhcpd.conf
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/dhcp/files/dhcpd.service b/poky/meta/recipes-connectivity/dhcp/files/dhcpd.service
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/dhcp/files/dhcpd.service
rename to poky/meta/recipes-connectivity/dhcp/files/dhcpd.service
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/dhcp/files/dhcpd6.service b/poky/meta/recipes-connectivity/dhcp/files/dhcpd6.service
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/dhcp/files/dhcpd6.service
rename to poky/meta/recipes-connectivity/dhcp/files/dhcpd6.service
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/dhcp/files/dhcrelay.service b/poky/meta/recipes-connectivity/dhcp/files/dhcrelay.service
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/dhcp/files/dhcrelay.service
rename to poky/meta/recipes-connectivity/dhcp/files/dhcrelay.service
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/dhcp/files/init-relay b/poky/meta/recipes-connectivity/dhcp/files/init-relay
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/dhcp/files/init-relay
rename to poky/meta/recipes-connectivity/dhcp/files/init-relay
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/dhcp/files/init-server b/poky/meta/recipes-connectivity/dhcp/files/init-server
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/dhcp/files/init-server
rename to poky/meta/recipes-connectivity/dhcp/files/init-server
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/iproute2/iproute2.inc b/poky/meta/recipes-connectivity/iproute2/iproute2.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/iproute2/iproute2.inc
rename to poky/meta/recipes-connectivity/iproute2/iproute2.inc
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/iproute2/iproute2/0001-ip-Remove-unneed-header.patch b/poky/meta/recipes-connectivity/iproute2/iproute2/0001-ip-Remove-unneed-header.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/iproute2/iproute2/0001-ip-Remove-unneed-header.patch
rename to poky/meta/recipes-connectivity/iproute2/iproute2/0001-ip-Remove-unneed-header.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/iproute2/iproute2/0001-iproute2-de-bash-scripts.patch b/poky/meta/recipes-connectivity/iproute2/iproute2/0001-iproute2-de-bash-scripts.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/iproute2/iproute2/0001-iproute2-de-bash-scripts.patch
rename to poky/meta/recipes-connectivity/iproute2/iproute2/0001-iproute2-de-bash-scripts.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch b/poky/meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch
rename to poky/meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch b/poky/meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch
rename to poky/meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/iproute2/iproute2_4.14.1.bb b/poky/meta/recipes-connectivity/iproute2/iproute2_4.14.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/iproute2/iproute2_4.14.1.bb
rename to poky/meta/recipes-connectivity/iproute2/iproute2_4.14.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/init b/poky/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/init
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/init
rename to poky/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/init
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/ldflags.patch b/poky/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/ldflags.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/ldflags.patch
rename to poky/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/ldflags.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/musl.patch b/poky/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/musl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/musl.patch
rename to poky/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/musl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb b/poky/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb
rename to poky/meta/recipes-connectivity/irda-utils/irda-utils_0.9.18.bb
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/iw/iw/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch b/poky/meta/recipes-connectivity/iw/iw/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/iw/iw/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch
rename to poky/meta/recipes-connectivity/iw/iw/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/iw/iw/separate-objdir.patch b/poky/meta/recipes-connectivity/iw/iw/separate-objdir.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/iw/iw/separate-objdir.patch
rename to poky/meta/recipes-connectivity/iw/iw/separate-objdir.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/iw/iw_4.14.bb b/poky/meta/recipes-connectivity/iw/iw_4.14.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/iw/iw_4.14.bb
rename to poky/meta/recipes-connectivity/iw/iw_4.14.bb
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/libnss-mdns/libnss-mdns/0001-check-for-nss.h.patch b/poky/meta/recipes-connectivity/libnss-mdns/libnss-mdns/0001-check-for-nss.h.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/libnss-mdns/libnss-mdns/0001-check-for-nss.h.patch
rename to poky/meta/recipes-connectivity/libnss-mdns/libnss-mdns/0001-check-for-nss.h.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb b/poky/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb
rename to poky/meta/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bb
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/libpcap/libpcap.inc b/poky/meta/recipes-connectivity/libpcap/libpcap.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/libpcap/libpcap.inc
rename to poky/meta/recipes-connectivity/libpcap/libpcap.inc
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/libpcap/libpcap/0001-Fix-compiler_state_t.ai-usage-when-INET6-is-not-defi.patch b/poky/meta/recipes-connectivity/libpcap/libpcap/0001-Fix-compiler_state_t.ai-usage-when-INET6-is-not-defi.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/libpcap/libpcap/0001-Fix-compiler_state_t.ai-usage-when-INET6-is-not-defi.patch
rename to poky/meta/recipes-connectivity/libpcap/libpcap/0001-Fix-compiler_state_t.ai-usage-when-INET6-is-not-defi.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/libpcap/libpcap/0002-Add-missing-compiler_state_t-parameter.patch b/poky/meta/recipes-connectivity/libpcap/libpcap/0002-Add-missing-compiler_state_t-parameter.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/libpcap/libpcap/0002-Add-missing-compiler_state_t-parameter.patch
rename to poky/meta/recipes-connectivity/libpcap/libpcap/0002-Add-missing-compiler_state_t-parameter.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/libpcap/libpcap/disable-remote.patch b/poky/meta/recipes-connectivity/libpcap/libpcap/disable-remote.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/libpcap/libpcap/disable-remote.patch
rename to poky/meta/recipes-connectivity/libpcap/libpcap/disable-remote.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/libpcap/libpcap/fix-grammar-deps.patch b/poky/meta/recipes-connectivity/libpcap/libpcap/fix-grammar-deps.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/libpcap/libpcap/fix-grammar-deps.patch
rename to poky/meta/recipes-connectivity/libpcap/libpcap/fix-grammar-deps.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/libpcap/libpcap/libpcap-pkgconfig-support.patch b/poky/meta/recipes-connectivity/libpcap/libpcap/libpcap-pkgconfig-support.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/libpcap/libpcap/libpcap-pkgconfig-support.patch
rename to poky/meta/recipes-connectivity/libpcap/libpcap/libpcap-pkgconfig-support.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb b/poky/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb
rename to poky/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb b/poky/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb
rename to poky/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/neard/neard/0001-Add-header-dependency-to-nciattach.o.patch b/poky/meta/recipes-connectivity/neard/neard/0001-Add-header-dependency-to-nciattach.o.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/neard/neard/0001-Add-header-dependency-to-nciattach.o.patch
rename to poky/meta/recipes-connectivity/neard/neard/0001-Add-header-dependency-to-nciattach.o.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/neard/neard/Makefile.am-do-not-ship-version.h.patch b/poky/meta/recipes-connectivity/neard/neard/Makefile.am-do-not-ship-version.h.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/neard/neard/Makefile.am-do-not-ship-version.h.patch
rename to poky/meta/recipes-connectivity/neard/neard/Makefile.am-do-not-ship-version.h.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/neard/neard/Makefile.am-fix-parallel-issue.patch b/poky/meta/recipes-connectivity/neard/neard/Makefile.am-fix-parallel-issue.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/neard/neard/Makefile.am-fix-parallel-issue.patch
rename to poky/meta/recipes-connectivity/neard/neard/Makefile.am-fix-parallel-issue.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/neard/neard/neard.in b/poky/meta/recipes-connectivity/neard/neard/neard.in
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/neard/neard/neard.in
rename to poky/meta/recipes-connectivity/neard/neard/neard.in
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/neard/neard_0.16.bb b/poky/meta/recipes-connectivity/neard/neard_0.16.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/neard/neard_0.16.bb
rename to poky/meta/recipes-connectivity/neard/neard_0.16.bb
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/nfs-utils/files/bugfix-adjust-statd-service-name.patch b/poky/meta/recipes-connectivity/nfs-utils/files/bugfix-adjust-statd-service-name.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/nfs-utils/files/bugfix-adjust-statd-service-name.patch
rename to poky/meta/recipes-connectivity/nfs-utils/files/bugfix-adjust-statd-service-name.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/nfs-utils/files/nfs-utils-debianize-start-statd.patch b/poky/meta/recipes-connectivity/nfs-utils/files/nfs-utils-debianize-start-statd.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/nfs-utils/files/nfs-utils-debianize-start-statd.patch
rename to poky/meta/recipes-connectivity/nfs-utils/files/nfs-utils-debianize-start-statd.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/nfs-utils/libnfsidmap/0001-include-sys-types.h-for-getting-u_-typedefs.patch b/poky/meta/recipes-connectivity/nfs-utils/libnfsidmap/0001-include-sys-types.h-for-getting-u_-typedefs.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/nfs-utils/libnfsidmap/0001-include-sys-types.h-for-getting-u_-typedefs.patch
rename to poky/meta/recipes-connectivity/nfs-utils/libnfsidmap/0001-include-sys-types.h-for-getting-u_-typedefs.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/nfs-utils/libnfsidmap/Set_nobody_user_group.patch b/poky/meta/recipes-connectivity/nfs-utils/libnfsidmap/Set_nobody_user_group.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/nfs-utils/libnfsidmap/Set_nobody_user_group.patch
rename to poky/meta/recipes-connectivity/nfs-utils/libnfsidmap/Set_nobody_user_group.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/nfs-utils/libnfsidmap/fix-ac-prereq.patch b/poky/meta/recipes-connectivity/nfs-utils/libnfsidmap/fix-ac-prereq.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/nfs-utils/libnfsidmap/fix-ac-prereq.patch
rename to poky/meta/recipes-connectivity/nfs-utils/libnfsidmap/fix-ac-prereq.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/nfs-utils/libnfsidmap_0.25.bb b/poky/meta/recipes-connectivity/nfs-utils/libnfsidmap_0.25.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/nfs-utils/libnfsidmap_0.25.bb
rename to poky/meta/recipes-connectivity/nfs-utils/libnfsidmap_0.25.bb
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch b/poky/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch
rename to poky/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-include-stdint.h-for-UINT16_MAX-definition.patch b/poky/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-include-stdint.h-for-UINT16_MAX-definition.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-include-stdint.h-for-UINT16_MAX-definition.patch
rename to poky/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-include-stdint.h-for-UINT16_MAX-definition.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service b/poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service
rename to poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-mountd.service
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service b/poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service
rename to poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-server.service
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service b/poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service
rename to poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-statd.service
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch b/poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch
rename to poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch b/poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch
rename to poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils.conf b/poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils.conf
rename to poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils.conf
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfscommon b/poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfscommon
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfscommon
rename to poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfscommon
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver b/poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver
rename to poky/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/proc-fs-nfsd.mount b/poky/meta/recipes-connectivity/nfs-utils/nfs-utils/proc-fs-nfsd.mount
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils/proc-fs-nfsd.mount
rename to poky/meta/recipes-connectivity/nfs-utils/nfs-utils/proc-fs-nfsd.mount
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils_2.1.1.bb b/poky/meta/recipes-connectivity/nfs-utils/nfs-utils_2.1.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/nfs-utils/nfs-utils_2.1.1.bb
rename to poky/meta/recipes-connectivity/nfs-utils/nfs-utils_2.1.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/ofono/ofono.inc b/poky/meta/recipes-connectivity/ofono/ofono.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/ofono/ofono.inc
rename to poky/meta/recipes-connectivity/ofono/ofono.inc
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/ofono/ofono/ofono b/poky/meta/recipes-connectivity/ofono/ofono/ofono
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/ofono/ofono/ofono
rename to poky/meta/recipes-connectivity/ofono/ofono/ofono
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/ofono/ofono/use-python3.patch b/poky/meta/recipes-connectivity/ofono/ofono/use-python3.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/ofono/ofono/use-python3.patch
rename to poky/meta/recipes-connectivity/ofono/ofono/use-python3.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/ofono/ofono_1.22.bb b/poky/meta/recipes-connectivity/ofono/ofono_1.22.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/ofono/ofono_1.22.bb
rename to poky/meta/recipes-connectivity/ofono/ofono_1.22.bb
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssh/openssh/add-test-support-for-busybox.patch b/poky/meta/recipes-connectivity/openssh/openssh/add-test-support-for-busybox.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssh/openssh/add-test-support-for-busybox.patch
rename to poky/meta/recipes-connectivity/openssh/openssh/add-test-support-for-busybox.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssh/openssh/disable-ciphers-not-supported-by-OpenSSL-DES.patch b/poky/meta/recipes-connectivity/openssh/openssh/disable-ciphers-not-supported-by-OpenSSL-DES.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssh/openssh/disable-ciphers-not-supported-by-OpenSSL-DES.patch
rename to poky/meta/recipes-connectivity/openssh/openssh/disable-ciphers-not-supported-by-OpenSSL-DES.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssh/openssh/fix-potential-signed-overflow-in-pointer-arithmatic.patch b/poky/meta/recipes-connectivity/openssh/openssh/fix-potential-signed-overflow-in-pointer-arithmatic.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssh/openssh/fix-potential-signed-overflow-in-pointer-arithmatic.patch
rename to poky/meta/recipes-connectivity/openssh/openssh/fix-potential-signed-overflow-in-pointer-arithmatic.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssh/openssh/init b/poky/meta/recipes-connectivity/openssh/openssh/init
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssh/openssh/init
rename to poky/meta/recipes-connectivity/openssh/openssh/init
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssh/openssh/run-ptest b/poky/meta/recipes-connectivity/openssh/openssh/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssh/openssh/run-ptest
rename to poky/meta/recipes-connectivity/openssh/openssh/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssh/openssh/ssh_config b/poky/meta/recipes-connectivity/openssh/openssh/ssh_config
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssh/openssh/ssh_config
rename to poky/meta/recipes-connectivity/openssh/openssh/ssh_config
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssh/openssh/sshd b/poky/meta/recipes-connectivity/openssh/openssh/sshd
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssh/openssh/sshd
rename to poky/meta/recipes-connectivity/openssh/openssh/sshd
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssh/openssh/sshd.socket b/poky/meta/recipes-connectivity/openssh/openssh/sshd.socket
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssh/openssh/sshd.socket
rename to poky/meta/recipes-connectivity/openssh/openssh/sshd.socket
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssh/openssh/sshd@.service b/poky/meta/recipes-connectivity/openssh/openssh/sshd@.service
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssh/openssh/sshd@.service
rename to poky/meta/recipes-connectivity/openssh/openssh/sshd@.service
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssh/openssh/sshd_check_keys b/poky/meta/recipes-connectivity/openssh/openssh/sshd_check_keys
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssh/openssh/sshd_check_keys
rename to poky/meta/recipes-connectivity/openssh/openssh/sshd_check_keys
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssh/openssh/sshd_config b/poky/meta/recipes-connectivity/openssh/openssh/sshd_config
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssh/openssh/sshd_config
rename to poky/meta/recipes-connectivity/openssh/openssh/sshd_config
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssh/openssh/sshdgenkeys.service b/poky/meta/recipes-connectivity/openssh/openssh/sshdgenkeys.service
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssh/openssh/sshdgenkeys.service
rename to poky/meta/recipes-connectivity/openssh/openssh/sshdgenkeys.service
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssh/openssh/volatiles.99_sshd b/poky/meta/recipes-connectivity/openssh/openssh/volatiles.99_sshd
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssh/openssh/volatiles.99_sshd
rename to poky/meta/recipes-connectivity/openssh/openssh/volatiles.99_sshd
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssh/openssh_7.6p1.bb b/poky/meta/recipes-connectivity/openssh/openssh_7.6p1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssh/openssh_7.6p1.bb
rename to poky/meta/recipes-connectivity/openssh/openssh_7.6p1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/0001-Fix-build-with-clang-using-external-assembler.patch b/poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/0001-Fix-build-with-clang-using-external-assembler.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/0001-Fix-build-with-clang-using-external-assembler.patch
rename to poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/0001-Fix-build-with-clang-using-external-assembler.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/0001-openssl-force-soft-link-to-avoid-rare-race.patch b/poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/0001-openssl-force-soft-link-to-avoid-rare-race.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/0001-openssl-force-soft-link-to-avoid-rare-race.patch
rename to poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/0001-openssl-force-soft-link-to-avoid-rare-race.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/Makefiles-ptest.patch b/poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/Makefiles-ptest.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/Makefiles-ptest.patch
rename to poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/Makefiles-ptest.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/Use-SHA256-not-MD5-as-default-digest.patch b/poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/Use-SHA256-not-MD5-as-default-digest.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/Use-SHA256-not-MD5-as-default-digest.patch
rename to poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/Use-SHA256-not-MD5-as-default-digest.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/configure-musl-target.patch b/poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/configure-musl-target.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/configure-musl-target.patch
rename to poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/configure-musl-target.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/configure-targets.patch b/poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/configure-targets.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/configure-targets.patch
rename to poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/configure-targets.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/c_rehash-compat.patch b/poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/c_rehash-compat.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/c_rehash-compat.patch
rename to poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/c_rehash-compat.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/ca.patch b/poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/ca.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/ca.patch
rename to poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/ca.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/debian-targets.patch b/poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/debian-targets.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/debian-targets.patch
rename to poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/debian-targets.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/man-dir.patch b/poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/man-dir.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/man-dir.patch
rename to poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/man-dir.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/man-section.patch b/poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/man-section.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/man-section.patch
rename to poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/man-section.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/no-rpath.patch b/poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/no-rpath.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/no-rpath.patch
rename to poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/no-rpath.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/no-symbolic.patch b/poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/no-symbolic.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/no-symbolic.patch
rename to poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/no-symbolic.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/pic.patch b/poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/pic.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/pic.patch
rename to poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian/pic.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian1.0.2/block_digicert_malaysia.patch b/poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian1.0.2/block_digicert_malaysia.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian1.0.2/block_digicert_malaysia.patch
rename to poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian1.0.2/block_digicert_malaysia.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian1.0.2/block_diginotar.patch b/poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian1.0.2/block_diginotar.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian1.0.2/block_diginotar.patch
rename to poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian1.0.2/block_diginotar.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian1.0.2/soname.patch b/poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian1.0.2/soname.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian1.0.2/soname.patch
rename to poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian1.0.2/soname.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian1.0.2/version-script.patch b/poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian1.0.2/version-script.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian1.0.2/version-script.patch
rename to poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/debian1.0.2/version-script.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/engines-install-in-libdir-ssl.patch b/poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/engines-install-in-libdir-ssl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/engines-install-in-libdir-ssl.patch
rename to poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/engines-install-in-libdir-ssl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/find.pl b/poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/find.pl
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/find.pl
rename to poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/find.pl
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/oe-ldflags.patch b/poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/oe-ldflags.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/oe-ldflags.patch
rename to poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/oe-ldflags.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl-c_rehash.sh b/poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl-c_rehash.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl-c_rehash.sh
rename to poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl-c_rehash.sh
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl-fix-des.pod-error.patch b/poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl-fix-des.pod-error.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl-fix-des.pod-error.patch
rename to poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl-fix-des.pod-error.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl-util-perlpath.pl-cwd.patch b/poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl-util-perlpath.pl-cwd.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl-util-perlpath.pl-cwd.patch
rename to poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl-util-perlpath.pl-cwd.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl_fix_for_x32.patch b/poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl_fix_for_x32.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl_fix_for_x32.patch
rename to poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl_fix_for_x32.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/parallel.patch b/poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/parallel.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/parallel.patch
rename to poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/parallel.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/ptest-deps.patch b/poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/ptest-deps.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/ptest-deps.patch
rename to poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/ptest-deps.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/ptest_makefile_deps.patch b/poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/ptest_makefile_deps.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/ptest_makefile_deps.patch
rename to poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/ptest_makefile_deps.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/reproducible-cflags.patch b/poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/reproducible-cflags.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/reproducible-cflags.patch
rename to poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/reproducible-cflags.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/reproducible-mkbuildinf.patch b/poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/reproducible-mkbuildinf.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/reproducible-mkbuildinf.patch
rename to poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/reproducible-mkbuildinf.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/run-ptest b/poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/run-ptest
rename to poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/shared-libs.patch b/poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/shared-libs.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/shared-libs.patch
rename to poky/meta/recipes-connectivity/openssl/openssl-1.0.2o/shared-libs.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl/0001-Take-linking-flags-from-LDFLAGS-env-var.patch b/poky/meta/recipes-connectivity/openssl/openssl/0001-Take-linking-flags-from-LDFLAGS-env-var.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl/0001-Take-linking-flags-from-LDFLAGS-env-var.patch
rename to poky/meta/recipes-connectivity/openssl/openssl/0001-Take-linking-flags-from-LDFLAGS-env-var.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh b/poky/meta/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh
rename to poky/meta/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl/run-ptest b/poky/meta/recipes-connectivity/openssl/openssl/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl/run-ptest
rename to poky/meta/recipes-connectivity/openssl/openssl/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl10.inc b/poky/meta/recipes-connectivity/openssl/openssl10.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl10.inc
rename to poky/meta/recipes-connectivity/openssl/openssl10.inc
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb b/poky/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
rename to poky/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb b/poky/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
rename to poky/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/ppp-dialin/files/host-peer b/poky/meta/recipes-connectivity/ppp-dialin/files/host-peer
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/ppp-dialin/files/host-peer
rename to poky/meta/recipes-connectivity/ppp-dialin/files/host-peer
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/ppp-dialin/files/ppp-dialin b/poky/meta/recipes-connectivity/ppp-dialin/files/ppp-dialin
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/ppp-dialin/files/ppp-dialin
rename to poky/meta/recipes-connectivity/ppp-dialin/files/ppp-dialin
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb b/poky/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb
rename to poky/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/0001-Fix-build-with-musl.patch b/poky/meta/recipes-connectivity/ppp/ppp/0001-Fix-build-with-musl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/0001-Fix-build-with-musl.patch
rename to poky/meta/recipes-connectivity/ppp/ppp/0001-Fix-build-with-musl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/0001-ppp-Fix-compilation-errors-in-Makefile.patch b/poky/meta/recipes-connectivity/ppp/ppp/0001-ppp-Fix-compilation-errors-in-Makefile.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/0001-ppp-Fix-compilation-errors-in-Makefile.patch
rename to poky/meta/recipes-connectivity/ppp/ppp/0001-ppp-Fix-compilation-errors-in-Makefile.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/0001-ppp-Remove-unneeded-include.patch b/poky/meta/recipes-connectivity/ppp/ppp/0001-ppp-Remove-unneeded-include.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/0001-ppp-Remove-unneeded-include.patch
rename to poky/meta/recipes-connectivity/ppp/ppp/0001-ppp-Remove-unneeded-include.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/0001-pppoe-include-netinet-in.h-before-linux-in.h.patch b/poky/meta/recipes-connectivity/ppp/ppp/0001-pppoe-include-netinet-in.h-before-linux-in.h.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/0001-pppoe-include-netinet-in.h-before-linux-in.h.patch
rename to poky/meta/recipes-connectivity/ppp/ppp/0001-pppoe-include-netinet-in.h-before-linux-in.h.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/08setupdns b/poky/meta/recipes-connectivity/ppp/ppp/08setupdns
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/08setupdns
rename to poky/meta/recipes-connectivity/ppp/ppp/08setupdns
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/92removedns b/poky/meta/recipes-connectivity/ppp/ppp/92removedns
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/92removedns
rename to poky/meta/recipes-connectivity/ppp/ppp/92removedns
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/cifdefroute.patch b/poky/meta/recipes-connectivity/ppp/ppp/cifdefroute.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/cifdefroute.patch
rename to poky/meta/recipes-connectivity/ppp/ppp/cifdefroute.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/copts.patch b/poky/meta/recipes-connectivity/ppp/ppp/copts.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/copts.patch
rename to poky/meta/recipes-connectivity/ppp/ppp/copts.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/fix-CVE-2015-3310.patch b/poky/meta/recipes-connectivity/ppp/ppp/fix-CVE-2015-3310.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/fix-CVE-2015-3310.patch
rename to poky/meta/recipes-connectivity/ppp/ppp/fix-CVE-2015-3310.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/init b/poky/meta/recipes-connectivity/ppp/ppp/init
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/init
rename to poky/meta/recipes-connectivity/ppp/ppp/init
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/ip-down b/poky/meta/recipes-connectivity/ppp/ppp/ip-down
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/ip-down
rename to poky/meta/recipes-connectivity/ppp/ppp/ip-down
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/ip-up b/poky/meta/recipes-connectivity/ppp/ppp/ip-up
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/ip-up
rename to poky/meta/recipes-connectivity/ppp/ppp/ip-up
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch b/poky/meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch
rename to poky/meta/recipes-connectivity/ppp/ppp/makefile-remove-hard-usr-reference.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/makefile.patch b/poky/meta/recipes-connectivity/ppp/ppp/makefile.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/makefile.patch
rename to poky/meta/recipes-connectivity/ppp/ppp/makefile.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/pap b/poky/meta/recipes-connectivity/ppp/ppp/pap
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/pap
rename to poky/meta/recipes-connectivity/ppp/ppp/pap
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/poff b/poky/meta/recipes-connectivity/ppp/ppp/poff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/poff
rename to poky/meta/recipes-connectivity/ppp/ppp/poff
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/pon b/poky/meta/recipes-connectivity/ppp/ppp/pon
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/pon
rename to poky/meta/recipes-connectivity/ppp/ppp/pon
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/ppp@.service b/poky/meta/recipes-connectivity/ppp/ppp/ppp@.service
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/ppp@.service
rename to poky/meta/recipes-connectivity/ppp/ppp/ppp@.service
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/ppp_on_boot b/poky/meta/recipes-connectivity/ppp/ppp/ppp_on_boot
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/ppp_on_boot
rename to poky/meta/recipes-connectivity/ppp/ppp/ppp_on_boot
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/pppd-resolv-varrun.patch b/poky/meta/recipes-connectivity/ppp/ppp/pppd-resolv-varrun.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/pppd-resolv-varrun.patch
rename to poky/meta/recipes-connectivity/ppp/ppp/pppd-resolv-varrun.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/provider b/poky/meta/recipes-connectivity/ppp/ppp/provider
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp/provider
rename to poky/meta/recipes-connectivity/ppp/ppp/provider
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp_2.4.7.bb b/poky/meta/recipes-connectivity/ppp/ppp_2.4.7.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/ppp/ppp_2.4.7.bb
rename to poky/meta/recipes-connectivity/ppp/ppp_2.4.7.bb
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/resolvconf/resolvconf/99_resolvconf b/poky/meta/recipes-connectivity/resolvconf/resolvconf/99_resolvconf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/resolvconf/resolvconf/99_resolvconf
rename to poky/meta/recipes-connectivity/resolvconf/resolvconf/99_resolvconf
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch b/poky/meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch
rename to poky/meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/resolvconf/resolvconf_1.79.bb b/poky/meta/recipes-connectivity/resolvconf/resolvconf_1.79.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/resolvconf/resolvconf_1.79.bb
rename to poky/meta/recipes-connectivity/resolvconf/resolvconf_1.79.bb
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/socat/socat/0001-Access-c_ispeed-and-c_ospeed-via-APIs.patch b/poky/meta/recipes-connectivity/socat/socat/0001-Access-c_ispeed-and-c_ospeed-via-APIs.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/socat/socat/0001-Access-c_ispeed-and-c_ospeed-via-APIs.patch
rename to poky/meta/recipes-connectivity/socat/socat/0001-Access-c_ispeed-and-c_ospeed-via-APIs.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/socat/socat/0001-define-NETDB_INTERNAL-to-1-if-not-available.patch b/poky/meta/recipes-connectivity/socat/socat/0001-define-NETDB_INTERNAL-to-1-if-not-available.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/socat/socat/0001-define-NETDB_INTERNAL-to-1-if-not-available.patch
rename to poky/meta/recipes-connectivity/socat/socat/0001-define-NETDB_INTERNAL-to-1-if-not-available.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/socat/socat/Makefile.in-fix-for-parallel-build.patch b/poky/meta/recipes-connectivity/socat/socat/Makefile.in-fix-for-parallel-build.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/socat/socat/Makefile.in-fix-for-parallel-build.patch
rename to poky/meta/recipes-connectivity/socat/socat/Makefile.in-fix-for-parallel-build.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/socat/socat_1.7.3.2.bb b/poky/meta/recipes-connectivity/socat/socat_1.7.3.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/socat/socat_1.7.3.2.bb
rename to poky/meta/recipes-connectivity/socat/socat_1.7.3.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/wireless-tools/wireless-tools/avoid_strip.patch b/poky/meta/recipes-connectivity/wireless-tools/wireless-tools/avoid_strip.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/wireless-tools/wireless-tools/avoid_strip.patch
rename to poky/meta/recipes-connectivity/wireless-tools/wireless-tools/avoid_strip.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/wireless-tools/wireless-tools/ldflags.patch b/poky/meta/recipes-connectivity/wireless-tools/wireless-tools/ldflags.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/wireless-tools/wireless-tools/ldflags.patch
rename to poky/meta/recipes-connectivity/wireless-tools/wireless-tools/ldflags.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/wireless-tools/wireless-tools/man.patch b/poky/meta/recipes-connectivity/wireless-tools/wireless-tools/man.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/wireless-tools/wireless-tools/man.patch
rename to poky/meta/recipes-connectivity/wireless-tools/wireless-tools/man.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/wireless-tools/wireless-tools/remove.ldconfig.call.patch b/poky/meta/recipes-connectivity/wireless-tools/wireless-tools/remove.ldconfig.call.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/wireless-tools/wireless-tools/remove.ldconfig.call.patch
rename to poky/meta/recipes-connectivity/wireless-tools/wireless-tools/remove.ldconfig.call.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/wireless-tools/wireless-tools_30.pre9.bb b/poky/meta/recipes-connectivity/wireless-tools/wireless-tools_30.pre9.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/wireless-tools/wireless-tools_30.pre9.bb
rename to poky/meta/recipes-connectivity/wireless-tools/wireless-tools_30.pre9.bb
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/99_wpa_supplicant b/poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/99_wpa_supplicant
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/99_wpa_supplicant
rename to poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/99_wpa_supplicant
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/defconfig b/poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/defconfig
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/defconfig
rename to poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/defconfig
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/key-replay-cve-multiple.patch b/poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/key-replay-cve-multiple.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/key-replay-cve-multiple.patch
rename to poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/key-replay-cve-multiple.patch
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa-supplicant.sh b/poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa-supplicant.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa-supplicant.sh
rename to poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa-supplicant.sh
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf b/poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf
rename to poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf-sane b/poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf-sane
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf-sane
rename to poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf-sane
diff --git a/import-layers/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.6.bb b/poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.6.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.6.bb
rename to poky/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.6.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/base-files/base-files/filesystems b/poky/meta/recipes-core/base-files/base-files/filesystems
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/base-files/base-files/filesystems
rename to poky/meta/recipes-core/base-files/base-files/filesystems
diff --git a/import-layers/yocto-poky/meta/recipes-core/base-files/base-files/fstab b/poky/meta/recipes-core/base-files/base-files/fstab
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/base-files/base-files/fstab
rename to poky/meta/recipes-core/base-files/base-files/fstab
diff --git a/import-layers/yocto-poky/meta/recipes-core/base-files/base-files/host.conf b/poky/meta/recipes-core/base-files/base-files/host.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/base-files/base-files/host.conf
rename to poky/meta/recipes-core/base-files/base-files/host.conf
diff --git a/import-layers/yocto-poky/meta/recipes-core/base-files/base-files/issue b/poky/meta/recipes-core/base-files/base-files/issue
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/base-files/base-files/issue
rename to poky/meta/recipes-core/base-files/base-files/issue
diff --git a/import-layers/yocto-poky/meta/recipes-core/base-files/base-files/issue.net b/poky/meta/recipes-core/base-files/base-files/issue.net
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/base-files/base-files/issue.net
rename to poky/meta/recipes-core/base-files/base-files/issue.net
diff --git a/import-layers/yocto-poky/meta/recipes-core/base-files/base-files/licenses/GPL-2 b/poky/meta/recipes-core/base-files/base-files/licenses/GPL-2
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/base-files/base-files/licenses/GPL-2
rename to poky/meta/recipes-core/base-files/base-files/licenses/GPL-2
diff --git a/import-layers/yocto-poky/meta/recipes-core/base-files/base-files/motd b/poky/meta/recipes-core/base-files/base-files/motd
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/base-files/base-files/motd
rename to poky/meta/recipes-core/base-files/base-files/motd
diff --git a/import-layers/yocto-poky/meta/recipes-core/base-files/base-files/nsswitch.conf b/poky/meta/recipes-core/base-files/base-files/nsswitch.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/base-files/base-files/nsswitch.conf
rename to poky/meta/recipes-core/base-files/base-files/nsswitch.conf
diff --git a/import-layers/yocto-poky/meta/recipes-core/base-files/base-files/profile b/poky/meta/recipes-core/base-files/base-files/profile
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/base-files/base-files/profile
rename to poky/meta/recipes-core/base-files/base-files/profile
diff --git a/import-layers/yocto-poky/meta/recipes-core/base-files/base-files/rotation b/poky/meta/recipes-core/base-files/base-files/rotation
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/base-files/base-files/rotation
rename to poky/meta/recipes-core/base-files/base-files/rotation
diff --git a/import-layers/yocto-poky/meta/recipes-core/base-files/base-files/share/dot.bashrc b/poky/meta/recipes-core/base-files/base-files/share/dot.bashrc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/base-files/base-files/share/dot.bashrc
rename to poky/meta/recipes-core/base-files/base-files/share/dot.bashrc
diff --git a/import-layers/yocto-poky/meta/recipes-core/base-files/base-files/share/dot.profile b/poky/meta/recipes-core/base-files/base-files/share/dot.profile
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/base-files/base-files/share/dot.profile
rename to poky/meta/recipes-core/base-files/base-files/share/dot.profile
diff --git a/import-layers/yocto-poky/meta/recipes-core/base-files/base-files/shells b/poky/meta/recipes-core/base-files/base-files/shells
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/base-files/base-files/shells
rename to poky/meta/recipes-core/base-files/base-files/shells
diff --git a/import-layers/yocto-poky/meta/recipes-core/base-files/base-files/usbd b/poky/meta/recipes-core/base-files/base-files/usbd
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/base-files/base-files/usbd
rename to poky/meta/recipes-core/base-files/base-files/usbd
diff --git a/import-layers/yocto-poky/meta/recipes-core/base-files/base-files_3.0.14.bb b/poky/meta/recipes-core/base-files/base-files_3.0.14.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/base-files/base-files_3.0.14.bb
rename to poky/meta/recipes-core/base-files/base-files_3.0.14.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/base-passwd/base-passwd/add_shutdown.patch b/poky/meta/recipes-core/base-passwd/base-passwd/add_shutdown.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/base-passwd/base-passwd/add_shutdown.patch
rename to poky/meta/recipes-core/base-passwd/base-passwd/add_shutdown.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/base-passwd/base-passwd/disable-docs.patch b/poky/meta/recipes-core/base-passwd/base-passwd/disable-docs.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/base-passwd/base-passwd/disable-docs.patch
rename to poky/meta/recipes-core/base-passwd/base-passwd/disable-docs.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/base-passwd/base-passwd/input.patch b/poky/meta/recipes-core/base-passwd/base-passwd/input.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/base-passwd/base-passwd/input.patch
rename to poky/meta/recipes-core/base-passwd/base-passwd/input.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/base-passwd/base-passwd/nobash.patch b/poky/meta/recipes-core/base-passwd/base-passwd/nobash.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/base-passwd/base-passwd/nobash.patch
rename to poky/meta/recipes-core/base-passwd/base-passwd/nobash.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/base-passwd/base-passwd/noshadow.patch b/poky/meta/recipes-core/base-passwd/base-passwd/noshadow.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/base-passwd/base-passwd/noshadow.patch
rename to poky/meta/recipes-core/base-passwd/base-passwd/noshadow.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb b/poky/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb
rename to poky/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/busybox-inittab_1.27.2.bb b/poky/meta/recipes-core/busybox/busybox-inittab_1.27.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/busybox-inittab_1.27.2.bb
rename to poky/meta/recipes-core/busybox/busybox-inittab_1.27.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/busybox.inc b/poky/meta/recipes-core/busybox/busybox.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/busybox.inc
rename to poky/meta/recipes-core/busybox/busybox.inc
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/busybox/0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch b/poky/meta/recipes-core/busybox/busybox/0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/busybox/0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch
rename to poky/meta/recipes-core/busybox/busybox/0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/busybox/CVE-2011-5325.patch b/poky/meta/recipes-core/busybox/busybox/CVE-2011-5325.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/busybox/CVE-2011-5325.patch
rename to poky/meta/recipes-core/busybox/busybox/CVE-2011-5325.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/busybox/CVE-2017-15873.patch b/poky/meta/recipes-core/busybox/busybox/CVE-2017-15873.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/busybox/CVE-2017-15873.patch
rename to poky/meta/recipes-core/busybox/busybox/CVE-2017-15873.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/busybox/busybox-CVE-2017-16544.patch b/poky/meta/recipes-core/busybox/busybox/busybox-CVE-2017-16544.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/busybox/busybox-CVE-2017-16544.patch
rename to poky/meta/recipes-core/busybox/busybox/busybox-CVE-2017-16544.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/busybox/busybox-cross-menuconfig.patch b/poky/meta/recipes-core/busybox/busybox/busybox-cross-menuconfig.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/busybox/busybox-cross-menuconfig.patch
rename to poky/meta/recipes-core/busybox/busybox/busybox-cross-menuconfig.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/busybox/busybox-udhcpc-no_deconfig.patch b/poky/meta/recipes-core/busybox/busybox/busybox-udhcpc-no_deconfig.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/busybox/busybox-udhcpc-no_deconfig.patch
rename to poky/meta/recipes-core/busybox/busybox/busybox-udhcpc-no_deconfig.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/busybox/defconfig b/poky/meta/recipes-core/busybox/busybox/defconfig
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/busybox/defconfig
rename to poky/meta/recipes-core/busybox/busybox/defconfig
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/busybox/fail_on_no_media.patch b/poky/meta/recipes-core/busybox/busybox/fail_on_no_media.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/busybox/fail_on_no_media.patch
rename to poky/meta/recipes-core/busybox/busybox/fail_on_no_media.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/busybox/getopts.cfg b/poky/meta/recipes-core/busybox/busybox/getopts.cfg
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/busybox/getopts.cfg
rename to poky/meta/recipes-core/busybox/busybox/getopts.cfg
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/busybox/init.cfg b/poky/meta/recipes-core/busybox/busybox/init.cfg
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/busybox/init.cfg
rename to poky/meta/recipes-core/busybox/busybox/init.cfg
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/busybox/login-utilities.cfg b/poky/meta/recipes-core/busybox/busybox/login-utilities.cfg
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/busybox/login-utilities.cfg
rename to poky/meta/recipes-core/busybox/busybox/login-utilities.cfg
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/busybox/makefile-libbb-race.patch b/poky/meta/recipes-core/busybox/busybox/makefile-libbb-race.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/busybox/makefile-libbb-race.patch
rename to poky/meta/recipes-core/busybox/busybox/makefile-libbb-race.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/busybox/mdev.cfg b/poky/meta/recipes-core/busybox/busybox/mdev.cfg
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/busybox/mdev.cfg
rename to poky/meta/recipes-core/busybox/busybox/mdev.cfg
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/busybox/mount-via-label.cfg b/poky/meta/recipes-core/busybox/busybox/mount-via-label.cfg
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/busybox/mount-via-label.cfg
rename to poky/meta/recipes-core/busybox/busybox/mount-via-label.cfg
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/busybox/musl.cfg b/poky/meta/recipes-core/busybox/busybox/musl.cfg
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/busybox/musl.cfg
rename to poky/meta/recipes-core/busybox/busybox/musl.cfg
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/busybox/recognize_connmand.patch b/poky/meta/recipes-core/busybox/busybox/recognize_connmand.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/busybox/recognize_connmand.patch
rename to poky/meta/recipes-core/busybox/busybox/recognize_connmand.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/busybox/resize.cfg b/poky/meta/recipes-core/busybox/busybox/resize.cfg
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/busybox/resize.cfg
rename to poky/meta/recipes-core/busybox/busybox/resize.cfg
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/busybox/sha1sum.cfg b/poky/meta/recipes-core/busybox/busybox/sha1sum.cfg
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/busybox/sha1sum.cfg
rename to poky/meta/recipes-core/busybox/busybox/sha1sum.cfg
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/busybox/sha256sum.cfg b/poky/meta/recipes-core/busybox/busybox/sha256sum.cfg
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/busybox/sha256sum.cfg
rename to poky/meta/recipes-core/busybox/busybox/sha256sum.cfg
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/busybox/syslog.cfg b/poky/meta/recipes-core/busybox/busybox/syslog.cfg
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/busybox/syslog.cfg
rename to poky/meta/recipes-core/busybox/busybox/syslog.cfg
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/busybox_1.27.2.bb b/poky/meta/recipes-core/busybox/busybox_1.27.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/busybox_1.27.2.bb
rename to poky/meta/recipes-core/busybox/busybox_1.27.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/files/busybox-cron b/poky/meta/recipes-core/busybox/files/busybox-cron
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/files/busybox-cron
rename to poky/meta/recipes-core/busybox/files/busybox-cron
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/files/busybox-httpd b/poky/meta/recipes-core/busybox/files/busybox-httpd
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/files/busybox-httpd
rename to poky/meta/recipes-core/busybox/files/busybox-httpd
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/files/busybox-klogd.service.in b/poky/meta/recipes-core/busybox/files/busybox-klogd.service.in
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/files/busybox-klogd.service.in
rename to poky/meta/recipes-core/busybox/files/busybox-klogd.service.in
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/files/busybox-syslog.default b/poky/meta/recipes-core/busybox/files/busybox-syslog.default
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/files/busybox-syslog.default
rename to poky/meta/recipes-core/busybox/files/busybox-syslog.default
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/files/busybox-syslog.service.in b/poky/meta/recipes-core/busybox/files/busybox-syslog.service.in
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/files/busybox-syslog.service.in
rename to poky/meta/recipes-core/busybox/files/busybox-syslog.service.in
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/files/busybox-udhcpd b/poky/meta/recipes-core/busybox/files/busybox-udhcpd
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/files/busybox-udhcpd
rename to poky/meta/recipes-core/busybox/files/busybox-udhcpd
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/files/default.script b/poky/meta/recipes-core/busybox/files/default.script
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/files/default.script
rename to poky/meta/recipes-core/busybox/files/default.script
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/files/find-touchscreen.sh b/poky/meta/recipes-core/busybox/files/find-touchscreen.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/files/find-touchscreen.sh
rename to poky/meta/recipes-core/busybox/files/find-touchscreen.sh
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/files/hwclock.sh b/poky/meta/recipes-core/busybox/files/hwclock.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/files/hwclock.sh
rename to poky/meta/recipes-core/busybox/files/hwclock.sh
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/files/inetd b/poky/meta/recipes-core/busybox/files/inetd
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/files/inetd
rename to poky/meta/recipes-core/busybox/files/inetd
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/files/inetd.conf b/poky/meta/recipes-core/busybox/files/inetd.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/files/inetd.conf
rename to poky/meta/recipes-core/busybox/files/inetd.conf
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/files/inittab b/poky/meta/recipes-core/busybox/files/inittab
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/files/inittab
rename to poky/meta/recipes-core/busybox/files/inittab
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/files/mdev b/poky/meta/recipes-core/busybox/files/mdev
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/files/mdev
rename to poky/meta/recipes-core/busybox/files/mdev
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/files/mdev-mount.sh b/poky/meta/recipes-core/busybox/files/mdev-mount.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/files/mdev-mount.sh
rename to poky/meta/recipes-core/busybox/files/mdev-mount.sh
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/files/mdev.conf b/poky/meta/recipes-core/busybox/files/mdev.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/files/mdev.conf
rename to poky/meta/recipes-core/busybox/files/mdev.conf
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/files/mount.busybox b/poky/meta/recipes-core/busybox/files/mount.busybox
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/files/mount.busybox
rename to poky/meta/recipes-core/busybox/files/mount.busybox
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/files/rcK b/poky/meta/recipes-core/busybox/files/rcK
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/files/rcK
rename to poky/meta/recipes-core/busybox/files/rcK
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/files/rcS b/poky/meta/recipes-core/busybox/files/rcS
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/files/rcS
rename to poky/meta/recipes-core/busybox/files/rcS
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/files/run-ptest b/poky/meta/recipes-core/busybox/files/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/files/run-ptest
rename to poky/meta/recipes-core/busybox/files/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/files/runlevel b/poky/meta/recipes-core/busybox/files/runlevel
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/files/runlevel
rename to poky/meta/recipes-core/busybox/files/runlevel
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/files/simple.script b/poky/meta/recipes-core/busybox/files/simple.script
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/files/simple.script
rename to poky/meta/recipes-core/busybox/files/simple.script
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/files/syslog b/poky/meta/recipes-core/busybox/files/syslog
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/files/syslog
rename to poky/meta/recipes-core/busybox/files/syslog
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/files/syslog-startup.conf b/poky/meta/recipes-core/busybox/files/syslog-startup.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/files/syslog-startup.conf
rename to poky/meta/recipes-core/busybox/files/syslog-startup.conf
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/files/syslog.conf b/poky/meta/recipes-core/busybox/files/syslog.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/files/syslog.conf
rename to poky/meta/recipes-core/busybox/files/syslog.conf
diff --git a/import-layers/yocto-poky/meta/recipes-core/busybox/files/umount.busybox b/poky/meta/recipes-core/busybox/files/umount.busybox
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/busybox/files/umount.busybox
rename to poky/meta/recipes-core/busybox/files/umount.busybox
diff --git a/import-layers/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/0001-Cover-the-else-with-__GLIBC__.patch b/poky/meta/recipes-core/console-tools/console-tools-0.3.2/0001-Cover-the-else-with-__GLIBC__.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/0001-Cover-the-else-with-__GLIBC__.patch
rename to poky/meta/recipes-core/console-tools/console-tools-0.3.2/0001-Cover-the-else-with-__GLIBC__.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/0001-Fix-format-security-compilation-error.patch b/poky/meta/recipes-core/console-tools/console-tools-0.3.2/0001-Fix-format-security-compilation-error.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/0001-Fix-format-security-compilation-error.patch
rename to poky/meta/recipes-core/console-tools/console-tools-0.3.2/0001-Fix-format-security-compilation-error.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/0001-kbdtools-Include-sys-types.h-for-u_char-and-u_short-.patch b/poky/meta/recipes-core/console-tools/console-tools-0.3.2/0001-kbdtools-Include-sys-types.h-for-u_char-and-u_short-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/0001-kbdtools-Include-sys-types.h-for-u_char-and-u_short-.patch
rename to poky/meta/recipes-core/console-tools/console-tools-0.3.2/0001-kbdtools-Include-sys-types.h-for-u_char-and-u_short-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/Makevars b/poky/meta/recipes-core/console-tools/console-tools-0.3.2/Makevars
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/Makevars
rename to poky/meta/recipes-core/console-tools/console-tools-0.3.2/Makevars
diff --git a/import-layers/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/codepage.patch b/poky/meta/recipes-core/console-tools/console-tools-0.3.2/codepage.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/codepage.patch
rename to poky/meta/recipes-core/console-tools/console-tools-0.3.2/codepage.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/compile.patch b/poky/meta/recipes-core/console-tools/console-tools-0.3.2/compile.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/compile.patch
rename to poky/meta/recipes-core/console-tools/console-tools-0.3.2/compile.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch b/poky/meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch
rename to poky/meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/fix-libconsole-linking.patch b/poky/meta/recipes-core/console-tools/console-tools-0.3.2/fix-libconsole-linking.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/fix-libconsole-linking.patch
rename to poky/meta/recipes-core/console-tools/console-tools-0.3.2/fix-libconsole-linking.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/kbdrate.patch b/poky/meta/recipes-core/console-tools/console-tools-0.3.2/kbdrate.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/kbdrate.patch
rename to poky/meta/recipes-core/console-tools/console-tools-0.3.2/kbdrate.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/lcmessage.m4 b/poky/meta/recipes-core/console-tools/console-tools-0.3.2/lcmessage.m4
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/lcmessage.m4
rename to poky/meta/recipes-core/console-tools/console-tools-0.3.2/lcmessage.m4
diff --git a/import-layers/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/no-dep-on-libfl.patch b/poky/meta/recipes-core/console-tools/console-tools-0.3.2/no-dep-on-libfl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/no-dep-on-libfl.patch
rename to poky/meta/recipes-core/console-tools/console-tools-0.3.2/no-dep-on-libfl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/nodocs.patch b/poky/meta/recipes-core/console-tools/console-tools-0.3.2/nodocs.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/nodocs.patch
rename to poky/meta/recipes-core/console-tools/console-tools-0.3.2/nodocs.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/uclibc-fileno.patch b/poky/meta/recipes-core/console-tools/console-tools-0.3.2/uclibc-fileno.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/console-tools/console-tools-0.3.2/uclibc-fileno.patch
rename to poky/meta/recipes-core/console-tools/console-tools-0.3.2/uclibc-fileno.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/console-tools/console-tools_0.3.2.bb b/poky/meta/recipes-core/console-tools/console-tools_0.3.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/console-tools/console-tools_0.3.2.bb
rename to poky/meta/recipes-core/console-tools/console-tools_0.3.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils/0001-Unset-need_charset_alias-when-building-for-musl.patch b/poky/meta/recipes-core/coreutils/coreutils/0001-Unset-need_charset_alias-when-building-for-musl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils/0001-Unset-need_charset_alias-when-building-for-musl.patch
rename to poky/meta/recipes-core/coreutils/coreutils/0001-Unset-need_charset_alias-when-building-for-musl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils/0001-local.mk-fix-cross-compiling-problem.patch b/poky/meta/recipes-core/coreutils/coreutils/0001-local.mk-fix-cross-compiling-problem.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils/0001-local.mk-fix-cross-compiling-problem.patch
rename to poky/meta/recipes-core/coreutils/coreutils/0001-local.mk-fix-cross-compiling-problem.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils/0001-uname-report-processor-and-hardware-correctly.patch b/poky/meta/recipes-core/coreutils/coreutils/0001-uname-report-processor-and-hardware-correctly.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils/0001-uname-report-processor-and-hardware-correctly.patch
rename to poky/meta/recipes-core/coreutils/coreutils/0001-uname-report-processor-and-hardware-correctly.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils/disable-ls-output-quoting.patch b/poky/meta/recipes-core/coreutils/coreutils/disable-ls-output-quoting.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils/disable-ls-output-quoting.patch
rename to poky/meta/recipes-core/coreutils/coreutils/disable-ls-output-quoting.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils/fix-selinux-flask.patch b/poky/meta/recipes-core/coreutils/coreutils/fix-selinux-flask.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils/fix-selinux-flask.patch
rename to poky/meta/recipes-core/coreutils/coreutils/fix-selinux-flask.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils/remove-usr-local-lib-from-m4.patch b/poky/meta/recipes-core/coreutils/coreutils/remove-usr-local-lib-from-m4.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils/remove-usr-local-lib-from-m4.patch
rename to poky/meta/recipes-core/coreutils/coreutils/remove-usr-local-lib-from-m4.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils_8.29.bb b/poky/meta/recipes-core/coreutils/coreutils_8.29.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/coreutils/coreutils_8.29.bb
rename to poky/meta/recipes-core/coreutils/coreutils_8.29.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/dbus-wait/dbus-wait_git.bb b/poky/meta/recipes-core/dbus-wait/dbus-wait_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/dbus-wait/dbus-wait_git.bb
rename to poky/meta/recipes-core/dbus-wait/dbus-wait_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/dbus/dbus-glib.inc b/poky/meta/recipes-core/dbus/dbus-glib.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/dbus/dbus-glib.inc
rename to poky/meta/recipes-core/dbus/dbus-glib.inc
diff --git a/import-layers/yocto-poky/meta/recipes-core/dbus/dbus-glib/no-examples.patch b/poky/meta/recipes-core/dbus/dbus-glib/no-examples.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/dbus/dbus-glib/no-examples.patch
rename to poky/meta/recipes-core/dbus/dbus-glib/no-examples.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/dbus/dbus-glib/test-install-makefile.patch b/poky/meta/recipes-core/dbus/dbus-glib/test-install-makefile.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/dbus/dbus-glib/test-install-makefile.patch
rename to poky/meta/recipes-core/dbus/dbus-glib/test-install-makefile.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/dbus/dbus-glib_0.108.bb b/poky/meta/recipes-core/dbus/dbus-glib_0.108.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/dbus/dbus-glib_0.108.bb
rename to poky/meta/recipes-core/dbus/dbus-glib_0.108.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/dbus/dbus-test_1.12.2.bb b/poky/meta/recipes-core/dbus/dbus-test_1.12.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/dbus/dbus-test_1.12.2.bb
rename to poky/meta/recipes-core/dbus/dbus-test_1.12.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/dbus/dbus/clear-guid_from_server-if-send_negotiate_unix_f.patch b/poky/meta/recipes-core/dbus/dbus/clear-guid_from_server-if-send_negotiate_unix_f.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/dbus/dbus/clear-guid_from_server-if-send_negotiate_unix_f.patch
rename to poky/meta/recipes-core/dbus/dbus/clear-guid_from_server-if-send_negotiate_unix_f.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/dbus/dbus/dbus-1.init b/poky/meta/recipes-core/dbus/dbus/dbus-1.init
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/dbus/dbus/dbus-1.init
rename to poky/meta/recipes-core/dbus/dbus/dbus-1.init
diff --git a/import-layers/yocto-poky/meta/recipes-core/dbus/dbus/python-config.patch b/poky/meta/recipes-core/dbus/dbus/python-config.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/dbus/dbus/python-config.patch
rename to poky/meta/recipes-core/dbus/dbus/python-config.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/dbus/dbus/run-ptest b/poky/meta/recipes-core/dbus/dbus/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/dbus/dbus/run-ptest
rename to poky/meta/recipes-core/dbus/dbus/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-core/dbus/dbus/tmpdir.patch b/poky/meta/recipes-core/dbus/dbus/tmpdir.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/dbus/dbus/tmpdir.patch
rename to poky/meta/recipes-core/dbus/dbus/tmpdir.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/dbus/dbus_1.12.2.bb b/poky/meta/recipes-core/dbus/dbus_1.12.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/dbus/dbus_1.12.2.bb
rename to poky/meta/recipes-core/dbus/dbus_1.12.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/dropbear/dropbear.inc b/poky/meta/recipes-core/dropbear/dropbear.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/dropbear/dropbear.inc
rename to poky/meta/recipes-core/dropbear/dropbear.inc
diff --git a/import-layers/yocto-poky/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch b/poky/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch
rename to poky/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/dropbear/dropbear/0003-configure.patch b/poky/meta/recipes-core/dropbear/dropbear/0003-configure.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/dropbear/dropbear/0003-configure.patch
rename to poky/meta/recipes-core/dropbear/dropbear/0003-configure.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/dropbear/dropbear/0004-fix-2kb-keys.patch b/poky/meta/recipes-core/dropbear/dropbear/0004-fix-2kb-keys.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/dropbear/dropbear/0004-fix-2kb-keys.patch
rename to poky/meta/recipes-core/dropbear/dropbear/0004-fix-2kb-keys.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/dropbear/dropbear/0005-dropbear-enable-pam.patch b/poky/meta/recipes-core/dropbear/dropbear/0005-dropbear-enable-pam.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/dropbear/dropbear/0005-dropbear-enable-pam.patch
rename to poky/meta/recipes-core/dropbear/dropbear/0005-dropbear-enable-pam.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/dropbear/dropbear/0006-dropbear-configuration-file.patch b/poky/meta/recipes-core/dropbear/dropbear/0006-dropbear-configuration-file.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/dropbear/dropbear/0006-dropbear-configuration-file.patch
rename to poky/meta/recipes-core/dropbear/dropbear/0006-dropbear-configuration-file.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/dropbear/dropbear/0007-dropbear-fix-for-x32-abi.patch b/poky/meta/recipes-core/dropbear/dropbear/0007-dropbear-fix-for-x32-abi.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/dropbear/dropbear/0007-dropbear-fix-for-x32-abi.patch
rename to poky/meta/recipes-core/dropbear/dropbear/0007-dropbear-fix-for-x32-abi.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/dropbear/dropbear/dropbear b/poky/meta/recipes-core/dropbear/dropbear/dropbear
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/dropbear/dropbear/dropbear
rename to poky/meta/recipes-core/dropbear/dropbear/dropbear
diff --git a/import-layers/yocto-poky/meta/recipes-core/dropbear/dropbear/dropbear.socket b/poky/meta/recipes-core/dropbear/dropbear/dropbear.socket
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/dropbear/dropbear/dropbear.socket
rename to poky/meta/recipes-core/dropbear/dropbear/dropbear.socket
diff --git a/import-layers/yocto-poky/meta/recipes-core/dropbear/dropbear/dropbear@.service b/poky/meta/recipes-core/dropbear/dropbear/dropbear@.service
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/dropbear/dropbear/dropbear@.service
rename to poky/meta/recipes-core/dropbear/dropbear/dropbear@.service
diff --git a/import-layers/yocto-poky/meta/recipes-core/dropbear/dropbear/dropbearkey.service b/poky/meta/recipes-core/dropbear/dropbear/dropbearkey.service
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/dropbear/dropbear/dropbearkey.service
rename to poky/meta/recipes-core/dropbear/dropbear/dropbearkey.service
diff --git a/import-layers/yocto-poky/meta/recipes-core/dropbear/dropbear/fix-libtomcrypt-libtommath-ordering.patch b/poky/meta/recipes-core/dropbear/dropbear/fix-libtomcrypt-libtommath-ordering.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/dropbear/dropbear/fix-libtomcrypt-libtommath-ordering.patch
rename to poky/meta/recipes-core/dropbear/dropbear/fix-libtomcrypt-libtommath-ordering.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/dropbear/dropbear/init b/poky/meta/recipes-core/dropbear/dropbear/init
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/dropbear/dropbear/init
rename to poky/meta/recipes-core/dropbear/dropbear/init
diff --git a/import-layers/yocto-poky/meta/recipes-core/dropbear/dropbear_2017.75.bb b/poky/meta/recipes-core/dropbear/dropbear_2017.75.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/dropbear/dropbear_2017.75.bb
rename to poky/meta/recipes-core/dropbear/dropbear_2017.75.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/expat/expat/autotools.patch b/poky/meta/recipes-core/expat/expat/autotools.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/expat/expat/autotools.patch
rename to poky/meta/recipes-core/expat/expat/autotools.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/expat/expat/libtool-tag.patch b/poky/meta/recipes-core/expat/expat/libtool-tag.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/expat/expat/libtool-tag.patch
rename to poky/meta/recipes-core/expat/expat/libtool-tag.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/expat/expat_2.2.5.bb b/poky/meta/recipes-core/expat/expat_2.2.5.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/expat/expat_2.2.5.bb
rename to poky/meta/recipes-core/expat/expat_2.2.5.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/fts/fts.bb b/poky/meta/recipes-core/fts/fts.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/fts/fts.bb
rename to poky/meta/recipes-core/fts/fts.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/gettext/gettext-0.19.8.1/add-with-bisonlocaledir.patch b/poky/meta/recipes-core/gettext/gettext-0.19.8.1/add-with-bisonlocaledir.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/gettext/gettext-0.19.8.1/add-with-bisonlocaledir.patch
rename to poky/meta/recipes-core/gettext/gettext-0.19.8.1/add-with-bisonlocaledir.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/gettext/gettext-0.19.8.1/cr-statement.c-timsort.h-fix-formatting-issues.patch b/poky/meta/recipes-core/gettext/gettext-0.19.8.1/cr-statement.c-timsort.h-fix-formatting-issues.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/gettext/gettext-0.19.8.1/cr-statement.c-timsort.h-fix-formatting-issues.patch
rename to poky/meta/recipes-core/gettext/gettext-0.19.8.1/cr-statement.c-timsort.h-fix-formatting-issues.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/gettext/gettext-0.19.8.1/parallel.patch b/poky/meta/recipes-core/gettext/gettext-0.19.8.1/parallel.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/gettext/gettext-0.19.8.1/parallel.patch
rename to poky/meta/recipes-core/gettext/gettext-0.19.8.1/parallel.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/gettext/gettext-0.19.8.1/use-pkgconfig.patch b/poky/meta/recipes-core/gettext/gettext-0.19.8.1/use-pkgconfig.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/gettext/gettext-0.19.8.1/use-pkgconfig.patch
rename to poky/meta/recipes-core/gettext/gettext-0.19.8.1/use-pkgconfig.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/0001-PATCH-Disable-the-test-to-convert-euc-jp.patch b/poky/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/0001-PATCH-Disable-the-test-to-convert-euc-jp.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/0001-PATCH-Disable-the-test-to-convert-euc-jp.patch
rename to poky/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/0001-PATCH-Disable-the-test-to-convert-euc-jp.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/COPYING b/poky/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/COPYING
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/COPYING
rename to poky/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/COPYING
diff --git a/import-layers/yocto-poky/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/Makefile.in.in b/poky/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/Makefile.in.in
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/Makefile.in.in
rename to poky/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/Makefile.in.in
diff --git a/import-layers/yocto-poky/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/aclocal.tgz b/poky/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/aclocal.tgz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/aclocal.tgz
rename to poky/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/aclocal.tgz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/config.rpath b/poky/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/config.rpath
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/config.rpath
rename to poky/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/config.rpath
diff --git a/import-layers/yocto-poky/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/remove-potcdate.sin b/poky/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/remove-potcdate.sin
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/remove-potcdate.sin
rename to poky/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/remove-potcdate.sin
diff --git a/import-layers/yocto-poky/meta/recipes-core/gettext/gettext-minimal-native_0.19.8.1.bb b/poky/meta/recipes-core/gettext/gettext-minimal-native_0.19.8.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/gettext/gettext-minimal-native_0.19.8.1.bb
rename to poky/meta/recipes-core/gettext/gettext-minimal-native_0.19.8.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/gettext/gettext_0.19.8.1.bb b/poky/meta/recipes-core/gettext/gettext_0.19.8.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/gettext/gettext_0.19.8.1.bb
rename to poky/meta/recipes-core/gettext/gettext_0.19.8.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch
rename to poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
rename to poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch
rename to poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Test-for-pthread_getname_np-before-using-it.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Test-for-pthread_getname_np-before-using-it.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Test-for-pthread_getname_np-before-using-it.patch
rename to poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Test-for-pthread_getname_np-before-using-it.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch
rename to poky/meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch
rename to poky/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/allow-run-media-sdX-drive-mount-if-username-root.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/allow-run-media-sdX-drive-mount-if-username-root.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/allow-run-media-sdX-drive-mount-if-username-root.patch
rename to poky/meta/recipes-core/glib-2.0/glib-2.0/allow-run-media-sdX-drive-mount-if-username-root.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch
rename to poky/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/ptest-paths.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/ptest-paths.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/ptest-paths.patch
rename to poky/meta/recipes-core/glib-2.0/glib-2.0/ptest-paths.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
rename to poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/run-ptest b/poky/meta/recipes-core/glib-2.0/glib-2.0/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/run-ptest
rename to poky/meta/recipes-core/glib-2.0/glib-2.0/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch
rename to poky/meta/recipes-core/glib-2.0/glib-2.0/uclibc_musl_translation.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0_2.54.3.bb b/poky/meta/recipes-core/glib-2.0/glib-2.0_2.54.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glib-2.0/glib-2.0_2.54.3.bb
rename to poky/meta/recipes-core/glib-2.0/glib-2.0_2.54.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/glib-2.0/glib.inc b/poky/meta/recipes-core/glib-2.0/glib.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glib-2.0/glib.inc
rename to poky/meta/recipes-core/glib-2.0/glib.inc
diff --git a/import-layers/yocto-poky/meta/recipes-core/glib-networking/glib-networking_2.54.1.bb b/poky/meta/recipes-core/glib-networking/glib-networking_2.54.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glib-networking/glib-networking_2.54.1.bb
rename to poky/meta/recipes-core/glib-networking/glib-networking_2.54.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/cross-localedef-native_2.27.bb b/poky/meta/recipes-core/glibc/cross-localedef-native_2.27.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/cross-localedef-native_2.27.bb
rename to poky/meta/recipes-core/glibc/cross-localedef-native_2.27.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc-collateral.inc b/poky/meta/recipes-core/glibc/glibc-collateral.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc-collateral.inc
rename to poky/meta/recipes-core/glibc/glibc-collateral.inc
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc-common.inc b/poky/meta/recipes-core/glibc/glibc-common.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc-common.inc
rename to poky/meta/recipes-core/glibc/glibc-common.inc
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc-initial.inc b/poky/meta/recipes-core/glibc/glibc-initial.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc-initial.inc
rename to poky/meta/recipes-core/glibc/glibc-initial.inc
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc-initial_2.27.bb b/poky/meta/recipes-core/glibc/glibc-initial_2.27.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc-initial_2.27.bb
rename to poky/meta/recipes-core/glibc/glibc-initial_2.27.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc-ld.inc b/poky/meta/recipes-core/glibc/glibc-ld.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc-ld.inc
rename to poky/meta/recipes-core/glibc/glibc-ld.inc
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc-locale.inc b/poky/meta/recipes-core/glibc/glibc-locale.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc-locale.inc
rename to poky/meta/recipes-core/glibc/glibc-locale.inc
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc-locale_2.27.bb b/poky/meta/recipes-core/glibc/glibc-locale_2.27.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc-locale_2.27.bb
rename to poky/meta/recipes-core/glibc/glibc-locale_2.27.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc-mtrace.inc b/poky/meta/recipes-core/glibc/glibc-mtrace.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc-mtrace.inc
rename to poky/meta/recipes-core/glibc/glibc-mtrace.inc
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc-mtrace_2.27.bb b/poky/meta/recipes-core/glibc/glibc-mtrace_2.27.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc-mtrace_2.27.bb
rename to poky/meta/recipes-core/glibc/glibc-mtrace_2.27.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc-package.inc b/poky/meta/recipes-core/glibc/glibc-package.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc-package.inc
rename to poky/meta/recipes-core/glibc/glibc-package.inc
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc-scripts.inc b/poky/meta/recipes-core/glibc/glibc-scripts.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc-scripts.inc
rename to poky/meta/recipes-core/glibc/glibc-scripts.inc
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc-scripts_2.27.bb b/poky/meta/recipes-core/glibc/glibc-scripts_2.27.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc-scripts_2.27.bb
rename to poky/meta/recipes-core/glibc/glibc-scripts_2.27.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc-testing.inc b/poky/meta/recipes-core/glibc/glibc-testing.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc-testing.inc
rename to poky/meta/recipes-core/glibc/glibc-testing.inc
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc.inc b/poky/meta/recipes-core/glibc/glibc.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc.inc
rename to poky/meta/recipes-core/glibc/glibc.inc
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch b/poky/meta/recipes-core/glibc/glibc/0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch
rename to poky/meta/recipes-core/glibc/glibc/0001-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0002-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch b/poky/meta/recipes-core/glibc/glibc/0002-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0002-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch
rename to poky/meta/recipes-core/glibc/glibc/0002-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch b/poky/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch
rename to poky/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0004-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch b/poky/meta/recipes-core/glibc/glibc/0004-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0004-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch
rename to poky/meta/recipes-core/glibc/glibc/0004-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0005-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch b/poky/meta/recipes-core/glibc/glibc/0005-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0005-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch
rename to poky/meta/recipes-core/glibc/glibc/0005-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0006-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch b/poky/meta/recipes-core/glibc/glibc/0006-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0006-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch
rename to poky/meta/recipes-core/glibc/glibc/0006-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0007-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch b/poky/meta/recipes-core/glibc/glibc/0007-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0007-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch
rename to poky/meta/recipes-core/glibc/glibc/0007-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0008-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch b/poky/meta/recipes-core/glibc/glibc/0008-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0008-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch
rename to poky/meta/recipes-core/glibc/glibc/0008-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0009-Quote-from-bug-1443-which-explains-what-the-patch-do.patch b/poky/meta/recipes-core/glibc/glibc/0009-Quote-from-bug-1443-which-explains-what-the-patch-do.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0009-Quote-from-bug-1443-which-explains-what-the-patch-do.patch
rename to poky/meta/recipes-core/glibc/glibc/0009-Quote-from-bug-1443-which-explains-what-the-patch-do.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0010-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch b/poky/meta/recipes-core/glibc/glibc/0010-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0010-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch
rename to poky/meta/recipes-core/glibc/glibc/0010-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0011-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch b/poky/meta/recipes-core/glibc/glibc/0011-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0011-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch
rename to poky/meta/recipes-core/glibc/glibc/0011-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0012-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch b/poky/meta/recipes-core/glibc/glibc/0012-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0012-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch
rename to poky/meta/recipes-core/glibc/glibc/0012-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0013-Add-unused-attribute.patch b/poky/meta/recipes-core/glibc/glibc/0013-Add-unused-attribute.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0013-Add-unused-attribute.patch
rename to poky/meta/recipes-core/glibc/glibc/0013-Add-unused-attribute.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0014-yes-within-the-path-sets-wrong-config-variables.patch b/poky/meta/recipes-core/glibc/glibc/0014-yes-within-the-path-sets-wrong-config-variables.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0014-yes-within-the-path-sets-wrong-config-variables.patch
rename to poky/meta/recipes-core/glibc/glibc/0014-yes-within-the-path-sets-wrong-config-variables.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0015-timezone-re-written-tzselect-as-posix-sh.patch b/poky/meta/recipes-core/glibc/glibc/0015-timezone-re-written-tzselect-as-posix-sh.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0015-timezone-re-written-tzselect-as-posix-sh.patch
rename to poky/meta/recipes-core/glibc/glibc/0015-timezone-re-written-tzselect-as-posix-sh.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0016-Remove-bash-dependency-for-nscd-init-script.patch b/poky/meta/recipes-core/glibc/glibc/0016-Remove-bash-dependency-for-nscd-init-script.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0016-Remove-bash-dependency-for-nscd-init-script.patch
rename to poky/meta/recipes-core/glibc/glibc/0016-Remove-bash-dependency-for-nscd-init-script.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0017-eglibc-Cross-building-and-testing-instructions.patch b/poky/meta/recipes-core/glibc/glibc/0017-eglibc-Cross-building-and-testing-instructions.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0017-eglibc-Cross-building-and-testing-instructions.patch
rename to poky/meta/recipes-core/glibc/glibc/0017-eglibc-Cross-building-and-testing-instructions.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0018-eglibc-Help-bootstrap-cross-toolchain.patch b/poky/meta/recipes-core/glibc/glibc/0018-eglibc-Help-bootstrap-cross-toolchain.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0018-eglibc-Help-bootstrap-cross-toolchain.patch
rename to poky/meta/recipes-core/glibc/glibc/0018-eglibc-Help-bootstrap-cross-toolchain.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0019-eglibc-Clear-cache-lines-on-ppc8xx.patch b/poky/meta/recipes-core/glibc/glibc/0019-eglibc-Clear-cache-lines-on-ppc8xx.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0019-eglibc-Clear-cache-lines-on-ppc8xx.patch
rename to poky/meta/recipes-core/glibc/glibc/0019-eglibc-Clear-cache-lines-on-ppc8xx.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0020-eglibc-Resolve-__fpscr_values-on-SH4.patch b/poky/meta/recipes-core/glibc/glibc/0020-eglibc-Resolve-__fpscr_values-on-SH4.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0020-eglibc-Resolve-__fpscr_values-on-SH4.patch
rename to poky/meta/recipes-core/glibc/glibc/0020-eglibc-Resolve-__fpscr_values-on-SH4.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0021-eglibc-Install-PIC-archives.patch b/poky/meta/recipes-core/glibc/glibc/0021-eglibc-Install-PIC-archives.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0021-eglibc-Install-PIC-archives.patch
rename to poky/meta/recipes-core/glibc/glibc/0021-eglibc-Install-PIC-archives.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0022-eglibc-Forward-port-cross-locale-generation-support.patch b/poky/meta/recipes-core/glibc/glibc/0022-eglibc-Forward-port-cross-locale-generation-support.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0022-eglibc-Forward-port-cross-locale-generation-support.patch
rename to poky/meta/recipes-core/glibc/glibc/0022-eglibc-Forward-port-cross-locale-generation-support.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0023-Define-DUMMY_LOCALE_T-if-not-defined.patch b/poky/meta/recipes-core/glibc/glibc/0023-Define-DUMMY_LOCALE_T-if-not-defined.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0023-Define-DUMMY_LOCALE_T-if-not-defined.patch
rename to poky/meta/recipes-core/glibc/glibc/0023-Define-DUMMY_LOCALE_T-if-not-defined.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch b/poky/meta/recipes-core/glibc/glibc/0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch
rename to poky/meta/recipes-core/glibc/glibc/0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0025-locale-fix-hard-coded-reference-to-gcc-E.patch b/poky/meta/recipes-core/glibc/glibc/0025-locale-fix-hard-coded-reference-to-gcc-E.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0025-locale-fix-hard-coded-reference-to-gcc-E.patch
rename to poky/meta/recipes-core/glibc/glibc/0025-locale-fix-hard-coded-reference-to-gcc-E.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0026-reset-dl_load_write_lock-after-forking.patch b/poky/meta/recipes-core/glibc/glibc/0026-reset-dl_load_write_lock-after-forking.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0026-reset-dl_load_write_lock-after-forking.patch
rename to poky/meta/recipes-core/glibc/glibc/0026-reset-dl_load_write_lock-after-forking.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0027-Acquire-ld.so-lock-before-switching-to-malloc_atfork.patch b/poky/meta/recipes-core/glibc/glibc/0027-Acquire-ld.so-lock-before-switching-to-malloc_atfork.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0027-Acquire-ld.so-lock-before-switching-to-malloc_atfork.patch
rename to poky/meta/recipes-core/glibc/glibc/0027-Acquire-ld.so-lock-before-switching-to-malloc_atfork.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0028-bits-siginfo-consts.h-enum-definition-for-TRAP_HWBKP.patch b/poky/meta/recipes-core/glibc/glibc/0028-bits-siginfo-consts.h-enum-definition-for-TRAP_HWBKP.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0028-bits-siginfo-consts.h-enum-definition-for-TRAP_HWBKP.patch
rename to poky/meta/recipes-core/glibc/glibc/0028-bits-siginfo-consts.h-enum-definition-for-TRAP_HWBKP.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0029-Replace-strncpy-with-memccpy-to-fix-Wstringop-trunca.patch b/poky/meta/recipes-core/glibc/glibc/0029-Replace-strncpy-with-memccpy-to-fix-Wstringop-trunca.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0029-Replace-strncpy-with-memccpy-to-fix-Wstringop-trunca.patch
rename to poky/meta/recipes-core/glibc/glibc/0029-Replace-strncpy-with-memccpy-to-fix-Wstringop-trunca.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0030-plural_c_no_preprocessor_lines.patch b/poky/meta/recipes-core/glibc/glibc/0030-plural_c_no_preprocessor_lines.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0030-plural_c_no_preprocessor_lines.patch
rename to poky/meta/recipes-core/glibc/glibc/0030-plural_c_no_preprocessor_lines.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0031-nativesdk-deprecate-libcrypt.patch b/poky/meta/recipes-core/glibc/glibc/0031-nativesdk-deprecate-libcrypt.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc/0031-nativesdk-deprecate-libcrypt.patch
rename to poky/meta/recipes-core/glibc/glibc/0031-nativesdk-deprecate-libcrypt.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc/archive-path.patch b/poky/meta/recipes-core/glibc/glibc/archive-path.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc/archive-path.patch
rename to poky/meta/recipes-core/glibc/glibc/archive-path.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc/etc/ld.so.conf b/poky/meta/recipes-core/glibc/glibc/etc/ld.so.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc/etc/ld.so.conf
rename to poky/meta/recipes-core/glibc/glibc/etc/ld.so.conf
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc/generate-supported.mk b/poky/meta/recipes-core/glibc/glibc/generate-supported.mk
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc/generate-supported.mk
rename to poky/meta/recipes-core/glibc/glibc/generate-supported.mk
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc/relocate-locales.patch b/poky/meta/recipes-core/glibc/glibc/relocate-locales.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc/relocate-locales.patch
rename to poky/meta/recipes-core/glibc/glibc/relocate-locales.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/glibc_2.27.bb b/poky/meta/recipes-core/glibc/glibc_2.27.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/glibc_2.27.bb
rename to poky/meta/recipes-core/glibc/glibc_2.27.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/32and64bit.patch b/poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/32and64bit.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/32and64bit.patch
rename to poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/32and64bit.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/README b/poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/README
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/README
rename to poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/README
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/add-64-bit-flag-for-ELF64-entries.patch b/poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/add-64-bit-flag-for-ELF64-entries.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/add-64-bit-flag-for-ELF64-entries.patch
rename to poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/add-64-bit-flag-for-ELF64-entries.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/endian-ness_handling.patch b/poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/endian-ness_handling.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/endian-ness_handling.patch
rename to poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/endian-ness_handling.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/endian-ness_handling_fix.patch b/poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/endian-ness_handling_fix.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/endian-ness_handling_fix.patch
rename to poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/endian-ness_handling_fix.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/endianess-header.patch b/poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/endianess-header.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/endianess-header.patch
rename to poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/endianess-header.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/flag_fix.patch b/poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/flag_fix.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/flag_fix.patch
rename to poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/flag_fix.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-default-to-all-multilib-dirs.patch b/poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-default-to-all-multilib-dirs.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-default-to-all-multilib-dirs.patch
rename to poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-default-to-all-multilib-dirs.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-native-2.12.1.tar.bz2 b/poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-native-2.12.1.tar.bz2
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-native-2.12.1.tar.bz2
rename to poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig-native-2.12.1.tar.bz2
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig.patch b/poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig.patch
rename to poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig_aux-cache_path_fix.patch b/poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig_aux-cache_path_fix.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig_aux-cache_path_fix.patch
rename to poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/ldconfig_aux-cache_path_fix.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb b/poky/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb
rename to poky/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/site_config/funcs b/poky/meta/recipes-core/glibc/site_config/funcs
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/site_config/funcs
rename to poky/meta/recipes-core/glibc/site_config/funcs
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/site_config/headers b/poky/meta/recipes-core/glibc/site_config/headers
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/site_config/headers
rename to poky/meta/recipes-core/glibc/site_config/headers
diff --git a/import-layers/yocto-poky/meta/recipes-core/glibc/site_config/types b/poky/meta/recipes-core/glibc/site_config/types
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/glibc/site_config/types
rename to poky/meta/recipes-core/glibc/site_config/types
diff --git a/import-layers/yocto-poky/meta/recipes-core/ifupdown/files/99_network b/poky/meta/recipes-core/ifupdown/files/99_network
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/ifupdown/files/99_network
rename to poky/meta/recipes-core/ifupdown/files/99_network
diff --git a/import-layers/yocto-poky/meta/recipes-core/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch b/poky/meta/recipes-core/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch
rename to poky/meta/recipes-core/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/ifupdown/files/inet-6-.defn-fix-inverted-checks-for-loopback.patch b/poky/meta/recipes-core/ifupdown/files/inet-6-.defn-fix-inverted-checks-for-loopback.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/ifupdown/files/inet-6-.defn-fix-inverted-checks-for-loopback.patch
rename to poky/meta/recipes-core/ifupdown/files/inet-6-.defn-fix-inverted-checks-for-loopback.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/ifupdown/ifupdown_0.8.16.bb b/poky/meta/recipes-core/ifupdown/ifupdown_0.8.16.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/ifupdown/ifupdown_0.8.16.bb
rename to poky/meta/recipes-core/ifupdown/ifupdown_0.8.16.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/images/build-appliance-image/README_VirtualBox_Guest_Additions.txt b/poky/meta/recipes-core/images/build-appliance-image/README_VirtualBox_Guest_Additions.txt
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/images/build-appliance-image/README_VirtualBox_Guest_Additions.txt
rename to poky/meta/recipes-core/images/build-appliance-image/README_VirtualBox_Guest_Additions.txt
diff --git a/import-layers/yocto-poky/meta/recipes-core/images/build-appliance-image/README_VirtualBox_Toaster.txt b/poky/meta/recipes-core/images/build-appliance-image/README_VirtualBox_Toaster.txt
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/images/build-appliance-image/README_VirtualBox_Toaster.txt
rename to poky/meta/recipes-core/images/build-appliance-image/README_VirtualBox_Toaster.txt
diff --git a/import-layers/yocto-poky/meta/recipes-core/images/build-appliance-image/Yocto_Build_Appliance.vmx b/poky/meta/recipes-core/images/build-appliance-image/Yocto_Build_Appliance.vmx
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/images/build-appliance-image/Yocto_Build_Appliance.vmx
rename to poky/meta/recipes-core/images/build-appliance-image/Yocto_Build_Appliance.vmx
diff --git a/import-layers/yocto-poky/meta/recipes-core/images/build-appliance-image/Yocto_Build_Appliance.vmxf b/poky/meta/recipes-core/images/build-appliance-image/Yocto_Build_Appliance.vmxf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/images/build-appliance-image/Yocto_Build_Appliance.vmxf
rename to poky/meta/recipes-core/images/build-appliance-image/Yocto_Build_Appliance.vmxf
diff --git a/import-layers/yocto-poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb b/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb
rename to poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/images/core-image-base.bb b/poky/meta/recipes-core/images/core-image-base.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/images/core-image-base.bb
rename to poky/meta/recipes-core/images/core-image-base.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/images/core-image-minimal-dev.bb b/poky/meta/recipes-core/images/core-image-minimal-dev.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/images/core-image-minimal-dev.bb
rename to poky/meta/recipes-core/images/core-image-minimal-dev.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/images/core-image-minimal-initramfs.bb b/poky/meta/recipes-core/images/core-image-minimal-initramfs.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/images/core-image-minimal-initramfs.bb
rename to poky/meta/recipes-core/images/core-image-minimal-initramfs.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/images/core-image-minimal-mtdutils.bb b/poky/meta/recipes-core/images/core-image-minimal-mtdutils.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/images/core-image-minimal-mtdutils.bb
rename to poky/meta/recipes-core/images/core-image-minimal-mtdutils.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/images/core-image-minimal.bb b/poky/meta/recipes-core/images/core-image-minimal.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/images/core-image-minimal.bb
rename to poky/meta/recipes-core/images/core-image-minimal.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/images/core-image-tiny-initramfs.bb b/poky/meta/recipes-core/images/core-image-tiny-initramfs.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/images/core-image-tiny-initramfs.bb
rename to poky/meta/recipes-core/images/core-image-tiny-initramfs.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/copyright b/poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/copyright
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/copyright
rename to poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/copyright
diff --git a/import-layers/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/init b/poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/init
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/init
rename to poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/init
diff --git a/import-layers/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/interfaces b/poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/interfaces
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/interfaces
rename to poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/interfaces
diff --git a/import-layers/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/nfsroot b/poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/nfsroot
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/nfsroot
rename to poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/nfsroot
diff --git a/import-layers/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarm/interfaces b/poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarm/interfaces
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarm/interfaces
rename to poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarm/interfaces
diff --git a/import-layers/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarm64/interfaces b/poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarm64/interfaces
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarm64/interfaces
rename to poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarm64/interfaces
diff --git a/import-layers/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv6/interfaces b/poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv6/interfaces
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv6/interfaces
rename to poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv6/interfaces
diff --git a/import-layers/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv7/interfaces b/poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv7/interfaces
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv7/interfaces
rename to poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv7/interfaces
diff --git a/import-layers/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips/interfaces b/poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips/interfaces
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips/interfaces
rename to poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips/interfaces
diff --git a/import-layers/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips64/interfaces b/poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips64/interfaces
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips64/interfaces
rename to poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips64/interfaces
diff --git a/import-layers/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuppc/interfaces b/poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuppc/interfaces
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuppc/interfaces
rename to poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuppc/interfaces
diff --git a/import-layers/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemush4/interfaces b/poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemush4/interfaces
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemush4/interfaces
rename to poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemush4/interfaces
diff --git a/import-layers/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86-64/interfaces b/poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86-64/interfaces
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86-64/interfaces
rename to poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86-64/interfaces
diff --git a/import-layers/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86/interfaces b/poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86/interfaces
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86/interfaces
rename to poky/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86/interfaces
diff --git a/import-layers/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb b/poky/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb
rename to poky/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/initrdscripts/files/init-boot.sh b/poky/meta/recipes-core/initrdscripts/files/init-boot.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initrdscripts/files/init-boot.sh
rename to poky/meta/recipes-core/initrdscripts/files/init-boot.sh
diff --git a/import-layers/yocto-poky/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh b/poky/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh
rename to poky/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh
diff --git a/import-layers/yocto-poky/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/poky/meta/recipes-core/initrdscripts/files/init-install-efi.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initrdscripts/files/init-install-efi.sh
rename to poky/meta/recipes-core/initrdscripts/files/init-install-efi.sh
diff --git a/import-layers/yocto-poky/meta/recipes-core/initrdscripts/files/init-install-testfs.sh b/poky/meta/recipes-core/initrdscripts/files/init-install-testfs.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initrdscripts/files/init-install-testfs.sh
rename to poky/meta/recipes-core/initrdscripts/files/init-install-testfs.sh
diff --git a/import-layers/yocto-poky/meta/recipes-core/initrdscripts/files/init-install.sh b/poky/meta/recipes-core/initrdscripts/files/init-install.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initrdscripts/files/init-install.sh
rename to poky/meta/recipes-core/initrdscripts/files/init-install.sh
diff --git a/import-layers/yocto-poky/meta/recipes-core/initrdscripts/files/init-live.sh b/poky/meta/recipes-core/initrdscripts/files/init-live.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initrdscripts/files/init-live.sh
rename to poky/meta/recipes-core/initrdscripts/files/init-live.sh
diff --git a/import-layers/yocto-poky/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb b/poky/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb
rename to poky/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/initrdscripts/initramfs-framework/debug b/poky/meta/recipes-core/initrdscripts/initramfs-framework/debug
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initrdscripts/initramfs-framework/debug
rename to poky/meta/recipes-core/initrdscripts/initramfs-framework/debug
diff --git a/import-layers/yocto-poky/meta/recipes-core/initrdscripts/initramfs-framework/e2fs b/poky/meta/recipes-core/initrdscripts/initramfs-framework/e2fs
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initrdscripts/initramfs-framework/e2fs
rename to poky/meta/recipes-core/initrdscripts/initramfs-framework/e2fs
diff --git a/import-layers/yocto-poky/meta/recipes-core/initrdscripts/initramfs-framework/exec b/poky/meta/recipes-core/initrdscripts/initramfs-framework/exec
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initrdscripts/initramfs-framework/exec
rename to poky/meta/recipes-core/initrdscripts/initramfs-framework/exec
diff --git a/import-layers/yocto-poky/meta/recipes-core/initrdscripts/initramfs-framework/finish b/poky/meta/recipes-core/initrdscripts/initramfs-framework/finish
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initrdscripts/initramfs-framework/finish
rename to poky/meta/recipes-core/initrdscripts/initramfs-framework/finish
diff --git a/import-layers/yocto-poky/meta/recipes-core/initrdscripts/initramfs-framework/init b/poky/meta/recipes-core/initrdscripts/initramfs-framework/init
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initrdscripts/initramfs-framework/init
rename to poky/meta/recipes-core/initrdscripts/initramfs-framework/init
diff --git a/import-layers/yocto-poky/meta/recipes-core/initrdscripts/initramfs-framework/mdev b/poky/meta/recipes-core/initrdscripts/initramfs-framework/mdev
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initrdscripts/initramfs-framework/mdev
rename to poky/meta/recipes-core/initrdscripts/initramfs-framework/mdev
diff --git a/import-layers/yocto-poky/meta/recipes-core/initrdscripts/initramfs-framework/rootfs b/poky/meta/recipes-core/initrdscripts/initramfs-framework/rootfs
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initrdscripts/initramfs-framework/rootfs
rename to poky/meta/recipes-core/initrdscripts/initramfs-framework/rootfs
diff --git a/import-layers/yocto-poky/meta/recipes-core/initrdscripts/initramfs-framework/setup-live b/poky/meta/recipes-core/initrdscripts/initramfs-framework/setup-live
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initrdscripts/initramfs-framework/setup-live
rename to poky/meta/recipes-core/initrdscripts/initramfs-framework/setup-live
diff --git a/import-layers/yocto-poky/meta/recipes-core/initrdscripts/initramfs-framework/udev b/poky/meta/recipes-core/initrdscripts/initramfs-framework/udev
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initrdscripts/initramfs-framework/udev
rename to poky/meta/recipes-core/initrdscripts/initramfs-framework/udev
diff --git a/import-layers/yocto-poky/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb b/poky/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb
rename to poky/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/initrdscripts/initramfs-live-boot-tiny_1.0.bb b/poky/meta/recipes-core/initrdscripts/initramfs-live-boot-tiny_1.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initrdscripts/initramfs-live-boot-tiny_1.0.bb
rename to poky/meta/recipes-core/initrdscripts/initramfs-live-boot-tiny_1.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb b/poky/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
rename to poky/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/initrdscripts/initramfs-live-install-efi-testfs_1.0.bb b/poky/meta/recipes-core/initrdscripts/initramfs-live-install-efi-testfs_1.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initrdscripts/initramfs-live-install-efi-testfs_1.0.bb
rename to poky/meta/recipes-core/initrdscripts/initramfs-live-install-efi-testfs_1.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb b/poky/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb
rename to poky/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb b/poky/meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb
rename to poky/meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb b/poky/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
rename to poky/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb b/poky/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb
rename to poky/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb b/poky/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb
rename to poky/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bb b/poky/meta/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bb
rename to poky/meta/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/GPLv2.patch b/poky/meta/recipes-core/initscripts/initscripts-1.0/GPLv2.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/GPLv2.patch
rename to poky/meta/recipes-core/initscripts/initscripts-1.0/GPLv2.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/arm/alignment.sh b/poky/meta/recipes-core/initscripts/initscripts-1.0/arm/alignment.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/arm/alignment.sh
rename to poky/meta/recipes-core/initscripts/initscripts-1.0/arm/alignment.sh
diff --git a/import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/banner.sh b/poky/meta/recipes-core/initscripts/initscripts-1.0/banner.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/banner.sh
rename to poky/meta/recipes-core/initscripts/initscripts-1.0/banner.sh
diff --git a/import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh b/poky/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
rename to poky/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
diff --git a/import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/checkfs.sh b/poky/meta/recipes-core/initscripts/initscripts-1.0/checkfs.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/checkfs.sh
rename to poky/meta/recipes-core/initscripts/initscripts-1.0/checkfs.sh
diff --git a/import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/checkroot.sh b/poky/meta/recipes-core/initscripts/initscripts-1.0/checkroot.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/checkroot.sh
rename to poky/meta/recipes-core/initscripts/initscripts-1.0/checkroot.sh
diff --git a/import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/devpts b/poky/meta/recipes-core/initscripts/initscripts-1.0/devpts
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/devpts
rename to poky/meta/recipes-core/initscripts/initscripts-1.0/devpts
diff --git a/import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/devpts.sh b/poky/meta/recipes-core/initscripts/initscripts-1.0/devpts.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/devpts.sh
rename to poky/meta/recipes-core/initscripts/initscripts-1.0/devpts.sh
diff --git a/import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/dmesg.sh b/poky/meta/recipes-core/initscripts/initscripts-1.0/dmesg.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/dmesg.sh
rename to poky/meta/recipes-core/initscripts/initscripts-1.0/dmesg.sh
diff --git a/import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/functions b/poky/meta/recipes-core/initscripts/initscripts-1.0/functions
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/functions
rename to poky/meta/recipes-core/initscripts/initscripts-1.0/functions
diff --git a/import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/halt b/poky/meta/recipes-core/initscripts/initscripts-1.0/halt
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/halt
rename to poky/meta/recipes-core/initscripts/initscripts-1.0/halt
diff --git a/import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/hostname.sh b/poky/meta/recipes-core/initscripts/initscripts-1.0/hostname.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/hostname.sh
rename to poky/meta/recipes-core/initscripts/initscripts-1.0/hostname.sh
diff --git a/import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/logrotate-dmesg.conf b/poky/meta/recipes-core/initscripts/initscripts-1.0/logrotate-dmesg.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/logrotate-dmesg.conf
rename to poky/meta/recipes-core/initscripts/initscripts-1.0/logrotate-dmesg.conf
diff --git a/import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/mountall.sh b/poky/meta/recipes-core/initscripts/initscripts-1.0/mountall.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/mountall.sh
rename to poky/meta/recipes-core/initscripts/initscripts-1.0/mountall.sh
diff --git a/import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/mountnfs.sh b/poky/meta/recipes-core/initscripts/initscripts-1.0/mountnfs.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/mountnfs.sh
rename to poky/meta/recipes-core/initscripts/initscripts-1.0/mountnfs.sh
diff --git a/import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh b/poky/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
rename to poky/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
diff --git a/import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/read-only-rootfs-hook.sh b/poky/meta/recipes-core/initscripts/initscripts-1.0/read-only-rootfs-hook.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/read-only-rootfs-hook.sh
rename to poky/meta/recipes-core/initscripts/initscripts-1.0/read-only-rootfs-hook.sh
diff --git a/import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/reboot b/poky/meta/recipes-core/initscripts/initscripts-1.0/reboot
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/reboot
rename to poky/meta/recipes-core/initscripts/initscripts-1.0/reboot
diff --git a/import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/rmnologin.sh b/poky/meta/recipes-core/initscripts/initscripts-1.0/rmnologin.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/rmnologin.sh
rename to poky/meta/recipes-core/initscripts/initscripts-1.0/rmnologin.sh
diff --git a/import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh b/poky/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh
rename to poky/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh
diff --git a/import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/sendsigs b/poky/meta/recipes-core/initscripts/initscripts-1.0/sendsigs
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/sendsigs
rename to poky/meta/recipes-core/initscripts/initscripts-1.0/sendsigs
diff --git a/import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/single b/poky/meta/recipes-core/initscripts/initscripts-1.0/single
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/single
rename to poky/meta/recipes-core/initscripts/initscripts-1.0/single
diff --git a/import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/sushell b/poky/meta/recipes-core/initscripts/initscripts-1.0/sushell
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/sushell
rename to poky/meta/recipes-core/initscripts/initscripts-1.0/sushell
diff --git a/import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/sysfs.sh b/poky/meta/recipes-core/initscripts/initscripts-1.0/sysfs.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/sysfs.sh
rename to poky/meta/recipes-core/initscripts/initscripts-1.0/sysfs.sh
diff --git a/import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/umountfs b/poky/meta/recipes-core/initscripts/initscripts-1.0/umountfs
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/umountfs
rename to poky/meta/recipes-core/initscripts/initscripts-1.0/umountfs
diff --git a/import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/umountnfs.sh b/poky/meta/recipes-core/initscripts/initscripts-1.0/umountnfs.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/umountnfs.sh
rename to poky/meta/recipes-core/initscripts/initscripts-1.0/umountnfs.sh
diff --git a/import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/urandom b/poky/meta/recipes-core/initscripts/initscripts-1.0/urandom
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/urandom
rename to poky/meta/recipes-core/initscripts/initscripts-1.0/urandom
diff --git a/import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/volatiles b/poky/meta/recipes-core/initscripts/initscripts-1.0/volatiles
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts-1.0/volatiles
rename to poky/meta/recipes-core/initscripts/initscripts-1.0/volatiles
diff --git a/import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts_1.0.bb b/poky/meta/recipes-core/initscripts/initscripts_1.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/initscripts/initscripts_1.0.bb
rename to poky/meta/recipes-core/initscripts/initscripts_1.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/kbd/kbd/run-ptest b/poky/meta/recipes-core/kbd/kbd/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/kbd/kbd/run-ptest
rename to poky/meta/recipes-core/kbd/kbd/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-core/kbd/kbd/set-proper-path-of-resources.patch b/poky/meta/recipes-core/kbd/kbd/set-proper-path-of-resources.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/kbd/kbd/set-proper-path-of-resources.patch
rename to poky/meta/recipes-core/kbd/kbd/set-proper-path-of-resources.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/kbd/kbd_2.0.4.bb b/poky/meta/recipes-core/kbd/kbd_2.0.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/kbd/kbd_2.0.4.bb
rename to poky/meta/recipes-core/kbd/kbd_2.0.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/libcgroup/libcgroup/musl-decls-compat.patch b/poky/meta/recipes-core/libcgroup/libcgroup/musl-decls-compat.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/libcgroup/libcgroup/musl-decls-compat.patch
rename to poky/meta/recipes-core/libcgroup/libcgroup/musl-decls-compat.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/libcgroup/libcgroup_0.41.bb b/poky/meta/recipes-core/libcgroup/libcgroup_0.41.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/libcgroup/libcgroup_0.41.bb
rename to poky/meta/recipes-core/libcgroup/libcgroup_0.41.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/libxcrypt/libxcrypt_4.0.1.bb b/poky/meta/recipes-core/libxcrypt/libxcrypt_4.0.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/libxcrypt/libxcrypt_4.0.1.bb
rename to poky/meta/recipes-core/libxcrypt/libxcrypt_4.0.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/libxml/libxml2/0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch b/poky/meta/recipes-core/libxml/libxml2/0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/libxml/libxml2/0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch
rename to poky/meta/recipes-core/libxml/libxml2/0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/libxml/libxml2/ansidecl.patch b/poky/meta/recipes-core/libxml/libxml2/ansidecl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/libxml/libxml2/ansidecl.patch
rename to poky/meta/recipes-core/libxml/libxml2/ansidecl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/libxml/libxml2/fix-execution-of-ptests.patch b/poky/meta/recipes-core/libxml/libxml2/fix-execution-of-ptests.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/libxml/libxml2/fix-execution-of-ptests.patch
rename to poky/meta/recipes-core/libxml/libxml2/fix-execution-of-ptests.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/libxml/libxml2/libxml-64bit.patch b/poky/meta/recipes-core/libxml/libxml2/libxml-64bit.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/libxml/libxml2/libxml-64bit.patch
rename to poky/meta/recipes-core/libxml/libxml2/libxml-64bit.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/libxml/libxml2/libxml-m4-use-pkgconfig.patch b/poky/meta/recipes-core/libxml/libxml2/libxml-m4-use-pkgconfig.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/libxml/libxml2/libxml-m4-use-pkgconfig.patch
rename to poky/meta/recipes-core/libxml/libxml2/libxml-m4-use-pkgconfig.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/libxml/libxml2/python-sitepackages-dir.patch b/poky/meta/recipes-core/libxml/libxml2/python-sitepackages-dir.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/libxml/libxml2/python-sitepackages-dir.patch
rename to poky/meta/recipes-core/libxml/libxml2/python-sitepackages-dir.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/libxml/libxml2/run-ptest b/poky/meta/recipes-core/libxml/libxml2/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/libxml/libxml2/run-ptest
rename to poky/meta/recipes-core/libxml/libxml2/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-core/libxml/libxml2/runtest.patch b/poky/meta/recipes-core/libxml/libxml2/runtest.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/libxml/libxml2/runtest.patch
rename to poky/meta/recipes-core/libxml/libxml2/runtest.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/libxml/libxml2_2.9.7.bb b/poky/meta/recipes-core/libxml/libxml2_2.9.7.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/libxml/libxml2_2.9.7.bb
rename to poky/meta/recipes-core/libxml/libxml2_2.9.7.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/meta/build-sysroots.bb b/poky/meta/recipes-core/meta/build-sysroots.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/meta/build-sysroots.bb
rename to poky/meta/recipes-core/meta/build-sysroots.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/meta/buildtools-tarball.bb b/poky/meta/recipes-core/meta/buildtools-tarball.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/meta/buildtools-tarball.bb
rename to poky/meta/recipes-core/meta/buildtools-tarball.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/meta/dummy-sdk-package.inc b/poky/meta/recipes-core/meta/dummy-sdk-package.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/meta/dummy-sdk-package.inc
rename to poky/meta/recipes-core/meta/dummy-sdk-package.inc
diff --git a/import-layers/yocto-poky/meta/recipes-core/meta/meta-environment-extsdk.bb b/poky/meta/recipes-core/meta/meta-environment-extsdk.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/meta/meta-environment-extsdk.bb
rename to poky/meta/recipes-core/meta/meta-environment-extsdk.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/meta/meta-environment.bb b/poky/meta/recipes-core/meta/meta-environment.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/meta/meta-environment.bb
rename to poky/meta/recipes-core/meta/meta-environment.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/meta/meta-extsdk-toolchain.bb b/poky/meta/recipes-core/meta/meta-extsdk-toolchain.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/meta/meta-extsdk-toolchain.bb
rename to poky/meta/recipes-core/meta/meta-extsdk-toolchain.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/meta/meta-go-toolchain.bb b/poky/meta/recipes-core/meta/meta-go-toolchain.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/meta/meta-go-toolchain.bb
rename to poky/meta/recipes-core/meta/meta-go-toolchain.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/meta/meta-ide-support.bb b/poky/meta/recipes-core/meta/meta-ide-support.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/meta/meta-ide-support.bb
rename to poky/meta/recipes-core/meta/meta-ide-support.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/meta/meta-toolchain.bb b/poky/meta/recipes-core/meta/meta-toolchain.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/meta/meta-toolchain.bb
rename to poky/meta/recipes-core/meta/meta-toolchain.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/meta/meta-world-pkgdata.bb b/poky/meta/recipes-core/meta/meta-world-pkgdata.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/meta/meta-world-pkgdata.bb
rename to poky/meta/recipes-core/meta/meta-world-pkgdata.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb b/poky/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb
rename to poky/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb b/poky/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb
rename to poky/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/meta/package-index.bb b/poky/meta/recipes-core/meta/package-index.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/meta/package-index.bb
rename to poky/meta/recipes-core/meta/package-index.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/meta/signing-keys.bb b/poky/meta/recipes-core/meta/signing-keys.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/meta/signing-keys.bb
rename to poky/meta/recipes-core/meta/signing-keys.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/meta/target-sdk-provides-dummy.bb b/poky/meta/recipes-core/meta/target-sdk-provides-dummy.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/meta/target-sdk-provides-dummy.bb
rename to poky/meta/recipes-core/meta/target-sdk-provides-dummy.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/meta/testexport-tarball.bb b/poky/meta/recipes-core/meta/testexport-tarball.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/meta/testexport-tarball.bb
rename to poky/meta/recipes-core/meta/testexport-tarball.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/meta/uninative-tarball.bb b/poky/meta/recipes-core/meta/uninative-tarball.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/meta/uninative-tarball.bb
rename to poky/meta/recipes-core/meta/uninative-tarball.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/meta/wic-tools.bb b/poky/meta/recipes-core/meta/wic-tools.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/meta/wic-tools.bb
rename to poky/meta/recipes-core/meta/wic-tools.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/musl/bsd-headers.bb b/poky/meta/recipes-core/musl/bsd-headers.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/musl/bsd-headers.bb
rename to poky/meta/recipes-core/musl/bsd-headers.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/musl/bsd-headers/sys-cdefs.h b/poky/meta/recipes-core/musl/bsd-headers/sys-cdefs.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/musl/bsd-headers/sys-cdefs.h
rename to poky/meta/recipes-core/musl/bsd-headers/sys-cdefs.h
diff --git a/import-layers/yocto-poky/meta/recipes-core/musl/bsd-headers/sys-queue.h b/poky/meta/recipes-core/musl/bsd-headers/sys-queue.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/musl/bsd-headers/sys-queue.h
rename to poky/meta/recipes-core/musl/bsd-headers/sys-queue.h
diff --git a/import-layers/yocto-poky/meta/recipes-core/musl/bsd-headers/sys-tree.h b/poky/meta/recipes-core/musl/bsd-headers/sys-tree.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/musl/bsd-headers/sys-tree.h
rename to poky/meta/recipes-core/musl/bsd-headers/sys-tree.h
diff --git a/import-layers/yocto-poky/meta/recipes-core/musl/musl-utils.bb b/poky/meta/recipes-core/musl/musl-utils.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/musl/musl-utils.bb
rename to poky/meta/recipes-core/musl/musl-utils.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/musl/musl.inc b/poky/meta/recipes-core/musl/musl.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/musl/musl.inc
rename to poky/meta/recipes-core/musl/musl.inc
diff --git a/import-layers/yocto-poky/meta/recipes-core/musl/musl/0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch b/poky/meta/recipes-core/musl/musl/0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/musl/musl/0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch
rename to poky/meta/recipes-core/musl/musl/0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/musl/musl_git.bb b/poky/meta/recipes-core/musl/musl_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/musl/musl_git.bb
rename to poky/meta/recipes-core/musl/musl_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/ncurses/files/0001-tic-hang.patch b/poky/meta/recipes-core/ncurses/files/0001-tic-hang.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/ncurses/files/0001-tic-hang.patch
rename to poky/meta/recipes-core/ncurses/files/0001-tic-hang.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch b/poky/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch
rename to poky/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/ncurses/files/config.cache b/poky/meta/recipes-core/ncurses/files/config.cache
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/ncurses/files/config.cache
rename to poky/meta/recipes-core/ncurses/files/config.cache
diff --git a/import-layers/yocto-poky/meta/recipes-core/ncurses/ncurses.inc b/poky/meta/recipes-core/ncurses/ncurses.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/ncurses/ncurses.inc
rename to poky/meta/recipes-core/ncurses/ncurses.inc
diff --git a/import-layers/yocto-poky/meta/recipes-core/ncurses/ncurses_6.0+20171125.bb b/poky/meta/recipes-core/ncurses/ncurses_6.0+20171125.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/ncurses/ncurses_6.0+20171125.bb
rename to poky/meta/recipes-core/ncurses/ncurses_6.0+20171125.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/ncurses/site_config/headers b/poky/meta/recipes-core/ncurses/site_config/headers
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/ncurses/site_config/headers
rename to poky/meta/recipes-core/ncurses/site_config/headers
diff --git a/import-layers/yocto-poky/meta/recipes-core/netbase/netbase/hosts b/poky/meta/recipes-core/netbase/netbase/hosts
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/netbase/netbase/hosts
rename to poky/meta/recipes-core/netbase/netbase/hosts
diff --git a/import-layers/yocto-poky/meta/recipes-core/netbase/netbase/netbase-add-rpcbind-as-an-alias-to-sunrpc.patch b/poky/meta/recipes-core/netbase/netbase/netbase-add-rpcbind-as-an-alias-to-sunrpc.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/netbase/netbase/netbase-add-rpcbind-as-an-alias-to-sunrpc.patch
rename to poky/meta/recipes-core/netbase/netbase/netbase-add-rpcbind-as-an-alias-to-sunrpc.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/netbase/netbase_5.4.bb b/poky/meta/recipes-core/netbase/netbase_5.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/netbase/netbase_5.4.bb
rename to poky/meta/recipes-core/netbase/netbase_5.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/os-release/os-release.bb b/poky/meta/recipes-core/os-release/os-release.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/os-release/os-release.bb
rename to poky/meta/recipes-core/os-release/os-release.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/ovmf/ovmf-shell-image.bb b/poky/meta/recipes-core/ovmf/ovmf-shell-image.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/ovmf/ovmf-shell-image.bb
rename to poky/meta/recipes-core/ovmf/ovmf-shell-image.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/ovmf/ovmf/0001-ia32-Dont-use-pie.patch b/poky/meta/recipes-core/ovmf/ovmf/0001-ia32-Dont-use-pie.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/ovmf/ovmf/0001-ia32-Dont-use-pie.patch
rename to poky/meta/recipes-core/ovmf/ovmf/0001-ia32-Dont-use-pie.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/ovmf/ovmf/0002-ovmf-update-path-to-native-BaseTools.patch b/poky/meta/recipes-core/ovmf/ovmf/0002-ovmf-update-path-to-native-BaseTools.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/ovmf/ovmf/0002-ovmf-update-path-to-native-BaseTools.patch
rename to poky/meta/recipes-core/ovmf/ovmf/0002-ovmf-update-path-to-native-BaseTools.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/ovmf/ovmf/0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch b/poky/meta/recipes-core/ovmf/ovmf/0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/ovmf/ovmf/0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch
rename to poky/meta/recipes-core/ovmf/ovmf/0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/ovmf/ovmf/0004-ovmf-enable-long-path-file.patch b/poky/meta/recipes-core/ovmf/ovmf/0004-ovmf-enable-long-path-file.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/ovmf/ovmf/0004-ovmf-enable-long-path-file.patch
rename to poky/meta/recipes-core/ovmf/ovmf/0004-ovmf-enable-long-path-file.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/ovmf/ovmf/0007-OvmfPkg-EnrollDefaultKeys-application-for-enrolling-.patch b/poky/meta/recipes-core/ovmf/ovmf/0007-OvmfPkg-EnrollDefaultKeys-application-for-enrolling-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/ovmf/ovmf/0007-OvmfPkg-EnrollDefaultKeys-application-for-enrolling-.patch
rename to poky/meta/recipes-core/ovmf/ovmf/0007-OvmfPkg-EnrollDefaultKeys-application-for-enrolling-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/ovmf/ovmf/VfrCompile-increase-path-length-limit.patch b/poky/meta/recipes-core/ovmf/ovmf/VfrCompile-increase-path-length-limit.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/ovmf/ovmf/VfrCompile-increase-path-length-limit.patch
rename to poky/meta/recipes-core/ovmf/ovmf/VfrCompile-increase-path-length-limit.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/ovmf/ovmf/no-stack-protector-all-archs.patch b/poky/meta/recipes-core/ovmf/ovmf/no-stack-protector-all-archs.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/ovmf/ovmf/no-stack-protector-all-archs.patch
rename to poky/meta/recipes-core/ovmf/ovmf/no-stack-protector-all-archs.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/ovmf/ovmf/ovmf-shell-image.wks b/poky/meta/recipes-core/ovmf/ovmf/ovmf-shell-image.wks
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/ovmf/ovmf/ovmf-shell-image.wks
rename to poky/meta/recipes-core/ovmf/ovmf/ovmf-shell-image.wks
diff --git a/import-layers/yocto-poky/meta/recipes-core/ovmf/ovmf_git.bb b/poky/meta/recipes-core/ovmf/ovmf_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/ovmf/ovmf_git.bb
rename to poky/meta/recipes-core/ovmf/ovmf_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb b/poky/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
rename to poky/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/packagegroups/packagegroup-base.bb b/poky/meta/recipes-core/packagegroups/packagegroup-base.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/packagegroups/packagegroup-base.bb
rename to poky/meta/recipes-core/packagegroups/packagegroup-base.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/poky/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
rename to poky/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb b/poky/meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb
rename to poky/meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-eclipse-debug.bb b/poky/meta/recipes-core/packagegroups/packagegroup-core-eclipse-debug.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-eclipse-debug.bb
rename to poky/meta/recipes-core/packagegroups/packagegroup-core-eclipse-debug.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb b/poky/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
rename to poky/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb b/poky/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
rename to poky/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb b/poky/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb
rename to poky/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb b/poky/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb
rename to poky/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb b/poky/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb
rename to poky/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb b/poky/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb
rename to poky/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/poky/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
rename to poky/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb b/poky/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
rename to poky/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb b/poky/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb
rename to poky/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/packagegroups/packagegroup-go-cross-canadian.bb b/poky/meta/recipes-core/packagegroups/packagegroup-go-cross-canadian.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/packagegroups/packagegroup-go-cross-canadian.bb
rename to poky/meta/recipes-core/packagegroups/packagegroup-go-cross-canadian.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/packagegroups/packagegroup-go-sdk-target.bb b/poky/meta/recipes-core/packagegroups/packagegroup-go-sdk-target.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/packagegroups/packagegroup-go-sdk-target.bb
rename to poky/meta/recipes-core/packagegroups/packagegroup-go-sdk-target.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/poky/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
rename to poky/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/psplash/files/psplash-init b/poky/meta/recipes-core/psplash/files/psplash-init
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/psplash/files/psplash-init
rename to poky/meta/recipes-core/psplash/files/psplash-init
diff --git a/import-layers/yocto-poky/meta/recipes-core/psplash/files/psplash-poky-img.h b/poky/meta/recipes-core/psplash/files/psplash-poky-img.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/psplash/files/psplash-poky-img.h
rename to poky/meta/recipes-core/psplash/files/psplash-poky-img.h
diff --git a/import-layers/yocto-poky/meta/recipes-core/psplash/psplash_git.bb b/poky/meta/recipes-core/psplash/psplash_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/psplash/psplash_git.bb
rename to poky/meta/recipes-core/psplash/psplash_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/readline/files/inputrc b/poky/meta/recipes-core/readline/files/inputrc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/readline/files/inputrc
rename to poky/meta/recipes-core/readline/files/inputrc
diff --git a/import-layers/yocto-poky/meta/recipes-core/readline/readline-7.0/configure-fix.patch b/poky/meta/recipes-core/readline/readline-7.0/configure-fix.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/readline/readline-7.0/configure-fix.patch
rename to poky/meta/recipes-core/readline/readline-7.0/configure-fix.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/readline/readline-7.0/norpath.patch b/poky/meta/recipes-core/readline/readline-7.0/norpath.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/readline/readline-7.0/norpath.patch
rename to poky/meta/recipes-core/readline/readline-7.0/norpath.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/readline/readline.inc b/poky/meta/recipes-core/readline/readline.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/readline/readline.inc
rename to poky/meta/recipes-core/readline/readline.inc
diff --git a/import-layers/yocto-poky/meta/recipes-core/readline/readline_7.0.bb b/poky/meta/recipes-core/readline/readline_7.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/readline/readline_7.0.bb
rename to poky/meta/recipes-core/readline/readline_7.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/obsolete_automake_macros.patch b/poky/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/obsolete_automake_macros.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/obsolete_automake_macros.patch
rename to poky/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/obsolete_automake_macros.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/separatebuild.patch b/poky/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/separatebuild.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/separatebuild.patch
rename to poky/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/separatebuild.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/sysfsutils-2.0.0-class-dup.patch b/poky/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/sysfsutils-2.0.0-class-dup.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/sysfsutils-2.0.0-class-dup.patch
rename to poky/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/sysfsutils-2.0.0-class-dup.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb b/poky/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb
rename to poky/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd-boot_237.bb b/poky/meta/recipes-core/systemd/systemd-boot_237.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd-boot_237.bb
rename to poky/meta/recipes-core/systemd/systemd-boot_237.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd-bootconf_1.00.bb b/poky/meta/recipes-core/systemd/systemd-bootconf_1.00.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd-bootconf_1.00.bb
rename to poky/meta/recipes-core/systemd/systemd-bootconf_1.00.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd-compat-units.bb b/poky/meta/recipes-core/systemd/systemd-compat-units.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd-compat-units.bb
rename to poky/meta/recipes-core/systemd/systemd-compat-units.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd-machine-units_1.0.bb b/poky/meta/recipes-core/systemd/systemd-machine-units_1.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd-machine-units_1.0.bb
rename to poky/meta/recipes-core/systemd/systemd-machine-units_1.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd-serialgetty.bb b/poky/meta/recipes-core/systemd/systemd-serialgetty.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd-serialgetty.bb
rename to poky/meta/recipes-core/systemd/systemd-serialgetty.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd-serialgetty/serial-getty@.service b/poky/meta/recipes-core/systemd/systemd-serialgetty/serial-getty@.service
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd-serialgetty/serial-getty@.service
rename to poky/meta/recipes-core/systemd/systemd-serialgetty/serial-getty@.service
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd-systemctl-native.bb b/poky/meta/recipes-core/systemd/systemd-systemctl-native.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd-systemctl-native.bb
rename to poky/meta/recipes-core/systemd/systemd-systemctl-native.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd-systemctl/systemctl b/poky/meta/recipes-core/systemd/systemd-systemctl/systemctl
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd-systemctl/systemctl
rename to poky/meta/recipes-core/systemd/systemd-systemctl/systemctl
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd.inc b/poky/meta/recipes-core/systemd/systemd.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd.inc
rename to poky/meta/recipes-core/systemd/systemd.inc
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/00-create-volatile.conf b/poky/meta/recipes-core/systemd/systemd/00-create-volatile.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/00-create-volatile.conf
rename to poky/meta/recipes-core/systemd/systemd/00-create-volatile.conf
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0001-Also-check-i386-i586-and-i686-for-ia32.patch b/poky/meta/recipes-core/systemd/systemd/0001-Also-check-i386-i586-and-i686-for-ia32.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0001-Also-check-i386-i586-and-i686-for-ia32.patch
rename to poky/meta/recipes-core/systemd/systemd/0001-Also-check-i386-i586-and-i686-for-ia32.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch b/poky/meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch
rename to poky/meta/recipes-core/systemd/systemd/0001-Fix-to-run-efi_cc-and-efi_ld-correctly-when-cross-co.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0001-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch b/poky/meta/recipes-core/systemd/systemd/0001-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0001-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch
rename to poky/meta/recipes-core/systemd/systemd/0001-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0001-Remove-fstack-protector-flags-to-workaround-musl-bui.patch b/poky/meta/recipes-core/systemd/systemd/0001-Remove-fstack-protector-flags-to-workaround-musl-bui.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0001-Remove-fstack-protector-flags-to-workaround-musl-bui.patch
rename to poky/meta/recipes-core/systemd/systemd/0001-Remove-fstack-protector-flags-to-workaround-musl-bui.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0001-Use-getenv-when-secure-versions-are-not-available.patch b/poky/meta/recipes-core/systemd/systemd/0001-Use-getenv-when-secure-versions-are-not-available.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0001-Use-getenv-when-secure-versions-are-not-available.patch
rename to poky/meta/recipes-core/systemd/systemd/0001-Use-getenv-when-secure-versions-are-not-available.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0001-core-device.c-Change-the-default-device-timeout-to-2.patch b/poky/meta/recipes-core/systemd/systemd/0001-core-device.c-Change-the-default-device-timeout-to-2.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0001-core-device.c-Change-the-default-device-timeout-to-2.patch
rename to poky/meta/recipes-core/systemd/systemd/0001-core-device.c-Change-the-default-device-timeout-to-2.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch b/poky/meta/recipes-core/systemd/systemd/0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch
rename to poky/meta/recipes-core/systemd/systemd/0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0003-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch b/poky/meta/recipes-core/systemd/systemd/0003-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0003-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
rename to poky/meta/recipes-core/systemd/systemd/0003-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0004-implment-systemd-sysv-install-for-OE.patch b/poky/meta/recipes-core/systemd/systemd/0004-implment-systemd-sysv-install-for-OE.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0004-implment-systemd-sysv-install-for-OE.patch
rename to poky/meta/recipes-core/systemd/systemd/0004-implment-systemd-sysv-install-for-OE.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0005-rules-whitelist-hd-devices.patch b/poky/meta/recipes-core/systemd/systemd/0005-rules-whitelist-hd-devices.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0005-rules-whitelist-hd-devices.patch
rename to poky/meta/recipes-core/systemd/systemd/0005-rules-whitelist-hd-devices.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0006-Make-root-s-home-directory-configurable.patch b/poky/meta/recipes-core/systemd/systemd/0006-Make-root-s-home-directory-configurable.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0006-Make-root-s-home-directory-configurable.patch
rename to poky/meta/recipes-core/systemd/systemd/0006-Make-root-s-home-directory-configurable.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0007-Revert-rules-remove-firmware-loading-rules.patch b/poky/meta/recipes-core/systemd/systemd/0007-Revert-rules-remove-firmware-loading-rules.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0007-Revert-rules-remove-firmware-loading-rules.patch
rename to poky/meta/recipes-core/systemd/systemd/0007-Revert-rules-remove-firmware-loading-rules.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0008-Revert-udev-remove-userspace-firmware-loading-suppor.patch b/poky/meta/recipes-core/systemd/systemd/0008-Revert-udev-remove-userspace-firmware-loading-suppor.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0008-Revert-udev-remove-userspace-firmware-loading-suppor.patch
rename to poky/meta/recipes-core/systemd/systemd/0008-Revert-udev-remove-userspace-firmware-loading-suppor.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0009-remove-duplicate-include-uchar.h.patch b/poky/meta/recipes-core/systemd/systemd/0009-remove-duplicate-include-uchar.h.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0009-remove-duplicate-include-uchar.h.patch
rename to poky/meta/recipes-core/systemd/systemd/0009-remove-duplicate-include-uchar.h.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0010-check-for-uchar.h-in-meson.build.patch b/poky/meta/recipes-core/systemd/systemd/0010-check-for-uchar.h-in-meson.build.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0010-check-for-uchar.h-in-meson.build.patch
rename to poky/meta/recipes-core/systemd/systemd/0010-check-for-uchar.h-in-meson.build.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0011-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch b/poky/meta/recipes-core/systemd/systemd/0011-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0011-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch
rename to poky/meta/recipes-core/systemd/systemd/0011-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0012-rules-watch-metadata-changes-in-ide-devices.patch b/poky/meta/recipes-core/systemd/systemd/0012-rules-watch-metadata-changes-in-ide-devices.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0012-rules-watch-metadata-changes-in-ide-devices.patch
rename to poky/meta/recipes-core/systemd/systemd/0012-rules-watch-metadata-changes-in-ide-devices.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0013-add-fallback-parse_printf_format-implementation.patch b/poky/meta/recipes-core/systemd/systemd/0013-add-fallback-parse_printf_format-implementation.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0013-add-fallback-parse_printf_format-implementation.patch
rename to poky/meta/recipes-core/systemd/systemd/0013-add-fallback-parse_printf_format-implementation.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0014-src-basic-missing.h-check-for-missing-strndupa.patch b/poky/meta/recipes-core/systemd/systemd/0014-src-basic-missing.h-check-for-missing-strndupa.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0014-src-basic-missing.h-check-for-missing-strndupa.patch
rename to poky/meta/recipes-core/systemd/systemd/0014-src-basic-missing.h-check-for-missing-strndupa.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0015-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch b/poky/meta/recipes-core/systemd/systemd/0015-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0015-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch
rename to poky/meta/recipes-core/systemd/systemd/0015-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0016-src-basic-missing.h-check-for-missing-__compar_fn_t-.patch b/poky/meta/recipes-core/systemd/systemd/0016-src-basic-missing.h-check-for-missing-__compar_fn_t-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0016-src-basic-missing.h-check-for-missing-__compar_fn_t-.patch
rename to poky/meta/recipes-core/systemd/systemd/0016-src-basic-missing.h-check-for-missing-__compar_fn_t-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0017-Include-netinet-if_ether.h.patch b/poky/meta/recipes-core/systemd/systemd/0017-Include-netinet-if_ether.h.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0017-Include-netinet-if_ether.h.patch
rename to poky/meta/recipes-core/systemd/systemd/0017-Include-netinet-if_ether.h.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0018-check-for-missing-canonicalize_file_name.patch b/poky/meta/recipes-core/systemd/systemd/0018-check-for-missing-canonicalize_file_name.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0018-check-for-missing-canonicalize_file_name.patch
rename to poky/meta/recipes-core/systemd/systemd/0018-check-for-missing-canonicalize_file_name.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0019-Do-not-enable-nss-tests-if-nss-systemd-is-not-enable.patch b/poky/meta/recipes-core/systemd/systemd/0019-Do-not-enable-nss-tests-if-nss-systemd-is-not-enable.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0019-Do-not-enable-nss-tests-if-nss-systemd-is-not-enable.patch
rename to poky/meta/recipes-core/systemd/systemd/0019-Do-not-enable-nss-tests-if-nss-systemd-is-not-enable.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0020-test-hexdecoct.c-Include-missing.h-for-strndupa.patch b/poky/meta/recipes-core/systemd/systemd/0020-test-hexdecoct.c-Include-missing.h-for-strndupa.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0020-test-hexdecoct.c-Include-missing.h-for-strndupa.patch
rename to poky/meta/recipes-core/systemd/systemd/0020-test-hexdecoct.c-Include-missing.h-for-strndupa.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0021-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch b/poky/meta/recipes-core/systemd/systemd/0021-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0021-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch
rename to poky/meta/recipes-core/systemd/systemd/0021-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0022-don-t-use-glibc-specific-qsort_r.patch b/poky/meta/recipes-core/systemd/systemd/0022-don-t-use-glibc-specific-qsort_r.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0022-don-t-use-glibc-specific-qsort_r.patch
rename to poky/meta/recipes-core/systemd/systemd/0022-don-t-use-glibc-specific-qsort_r.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0023-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch b/poky/meta/recipes-core/systemd/systemd/0023-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0023-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
rename to poky/meta/recipes-core/systemd/systemd/0023-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0024-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch b/poky/meta/recipes-core/systemd/systemd/0024-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0024-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch
rename to poky/meta/recipes-core/systemd/systemd/0024-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0025-Define-_PATH_WTMPX-and-_PATH_UTMPX-if-not-defined.patch b/poky/meta/recipes-core/systemd/systemd/0025-Define-_PATH_WTMPX-and-_PATH_UTMPX-if-not-defined.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0025-Define-_PATH_WTMPX-and-_PATH_UTMPX-if-not-defined.patch
rename to poky/meta/recipes-core/systemd/systemd/0025-Define-_PATH_WTMPX-and-_PATH_UTMPX-if-not-defined.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0026-Use-uintmax_t-for-handling-rlim_t.patch b/poky/meta/recipes-core/systemd/systemd/0026-Use-uintmax_t-for-handling-rlim_t.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0026-Use-uintmax_t-for-handling-rlim_t.patch
rename to poky/meta/recipes-core/systemd/systemd/0026-Use-uintmax_t-for-handling-rlim_t.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0027-remove-nobody-user-group-checking.patch b/poky/meta/recipes-core/systemd/systemd/0027-remove-nobody-user-group-checking.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0027-remove-nobody-user-group-checking.patch
rename to poky/meta/recipes-core/systemd/systemd/0027-remove-nobody-user-group-checking.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0028-add-missing-FTW_-macros-for-musl.patch b/poky/meta/recipes-core/systemd/systemd/0028-add-missing-FTW_-macros-for-musl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0028-add-missing-FTW_-macros-for-musl.patch
rename to poky/meta/recipes-core/systemd/systemd/0028-add-missing-FTW_-macros-for-musl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0029-nss-mymachines-Build-conditionally-when-ENABLE_MYHOS.patch b/poky/meta/recipes-core/systemd/systemd/0029-nss-mymachines-Build-conditionally-when-ENABLE_MYHOS.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0029-nss-mymachines-Build-conditionally-when-ENABLE_MYHOS.patch
rename to poky/meta/recipes-core/systemd/systemd/0029-nss-mymachines-Build-conditionally-when-ENABLE_MYHOS.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0030-fix-missing-of-__register_atfork-for-non-glibc-build.patch b/poky/meta/recipes-core/systemd/systemd/0030-fix-missing-of-__register_atfork-for-non-glibc-build.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0030-fix-missing-of-__register_atfork-for-non-glibc-build.patch
rename to poky/meta/recipes-core/systemd/systemd/0030-fix-missing-of-__register_atfork-for-non-glibc-build.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0031-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch b/poky/meta/recipes-core/systemd/systemd/0031-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0031-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch
rename to poky/meta/recipes-core/systemd/systemd/0031-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0032-memfd.patch b/poky/meta/recipes-core/systemd/systemd/0032-memfd.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0032-memfd.patch
rename to poky/meta/recipes-core/systemd/systemd/0032-memfd.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0033-basic-macros-rename-noreturn-into-_noreturn_-8456.patch b/poky/meta/recipes-core/systemd/systemd/0033-basic-macros-rename-noreturn-into-_noreturn_-8456.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0033-basic-macros-rename-noreturn-into-_noreturn_-8456.patch
rename to poky/meta/recipes-core/systemd/systemd/0033-basic-macros-rename-noreturn-into-_noreturn_-8456.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0034-Fix-format-truncation-compile-failure-by-typecasting.patch b/poky/meta/recipes-core/systemd/systemd/0034-Fix-format-truncation-compile-failure-by-typecasting.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0034-Fix-format-truncation-compile-failure-by-typecasting.patch
rename to poky/meta/recipes-core/systemd/systemd/0034-Fix-format-truncation-compile-failure-by-typecasting.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0035-Define-glibc-compatible-basename-for-non-glibc-syste.patch b/poky/meta/recipes-core/systemd/systemd/0035-Define-glibc-compatible-basename-for-non-glibc-syste.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0035-Define-glibc-compatible-basename-for-non-glibc-syste.patch
rename to poky/meta/recipes-core/systemd/systemd/0035-Define-glibc-compatible-basename-for-non-glibc-syste.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/init b/poky/meta/recipes-core/systemd/systemd/init
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/init
rename to poky/meta/recipes-core/systemd/systemd/init
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/libmount.patch b/poky/meta/recipes-core/systemd/systemd/libmount.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/libmount.patch
rename to poky/meta/recipes-core/systemd/systemd/libmount.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/touchscreen.rules b/poky/meta/recipes-core/systemd/systemd/touchscreen.rules
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd/touchscreen.rules
rename to poky/meta/recipes-core/systemd/systemd/touchscreen.rules
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd_237.bb b/poky/meta/recipes-core/systemd/systemd_237.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/systemd/systemd_237.bb
rename to poky/meta/recipes-core/systemd/systemd_237.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/sysvinit/sysvinit-2.88dsf/crypt-lib.patch b/poky/meta/recipes-core/sysvinit/sysvinit-2.88dsf/crypt-lib.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/sysvinit/sysvinit-2.88dsf/crypt-lib.patch
rename to poky/meta/recipes-core/sysvinit/sysvinit-2.88dsf/crypt-lib.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/sysvinit/sysvinit-2.88dsf/install.patch b/poky/meta/recipes-core/sysvinit/sysvinit-2.88dsf/install.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/sysvinit/sysvinit-2.88dsf/install.patch
rename to poky/meta/recipes-core/sysvinit/sysvinit-2.88dsf/install.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/sysvinit/sysvinit-2.88dsf/pidof-add-m-option.patch b/poky/meta/recipes-core/sysvinit/sysvinit-2.88dsf/pidof-add-m-option.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/sysvinit/sysvinit-2.88dsf/pidof-add-m-option.patch
rename to poky/meta/recipes-core/sysvinit/sysvinit-2.88dsf/pidof-add-m-option.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/sysvinit/sysvinit-inittab/inittab b/poky/meta/recipes-core/sysvinit/sysvinit-inittab/inittab
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/sysvinit/sysvinit-inittab/inittab
rename to poky/meta/recipes-core/sysvinit/sysvinit-inittab/inittab
diff --git a/import-layers/yocto-poky/meta/recipes-core/sysvinit/sysvinit-inittab/start_getty b/poky/meta/recipes-core/sysvinit/sysvinit-inittab/start_getty
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/sysvinit/sysvinit-inittab/start_getty
rename to poky/meta/recipes-core/sysvinit/sysvinit-inittab/start_getty
diff --git a/import-layers/yocto-poky/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb b/poky/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
rename to poky/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/sysvinit/sysvinit/0001-This-fixes-an-issue-that-clang-reports-about-mutlipl.patch b/poky/meta/recipes-core/sysvinit/sysvinit/0001-This-fixes-an-issue-that-clang-reports-about-mutlipl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/sysvinit/sysvinit/0001-This-fixes-an-issue-that-clang-reports-about-mutlipl.patch
rename to poky/meta/recipes-core/sysvinit/sysvinit/0001-This-fixes-an-issue-that-clang-reports-about-mutlipl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/sysvinit/sysvinit/01_bootlogd b/poky/meta/recipes-core/sysvinit/sysvinit/01_bootlogd
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/sysvinit/sysvinit/01_bootlogd
rename to poky/meta/recipes-core/sysvinit/sysvinit/01_bootlogd
diff --git a/import-layers/yocto-poky/meta/recipes-core/sysvinit/sysvinit/bootlogd.init b/poky/meta/recipes-core/sysvinit/sysvinit/bootlogd.init
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/sysvinit/sysvinit/bootlogd.init
rename to poky/meta/recipes-core/sysvinit/sysvinit/bootlogd.init
diff --git a/import-layers/yocto-poky/meta/recipes-core/sysvinit/sysvinit/rc b/poky/meta/recipes-core/sysvinit/sysvinit/rc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/sysvinit/sysvinit/rc
rename to poky/meta/recipes-core/sysvinit/sysvinit/rc
diff --git a/import-layers/yocto-poky/meta/recipes-core/sysvinit/sysvinit/rcS b/poky/meta/recipes-core/sysvinit/sysvinit/rcS
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/sysvinit/sysvinit/rcS
rename to poky/meta/recipes-core/sysvinit/sysvinit/rcS
diff --git a/import-layers/yocto-poky/meta/recipes-core/sysvinit/sysvinit/rcS-default b/poky/meta/recipes-core/sysvinit/sysvinit/rcS-default
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/sysvinit/sysvinit/rcS-default
rename to poky/meta/recipes-core/sysvinit/sysvinit/rcS-default
diff --git a/import-layers/yocto-poky/meta/recipes-core/sysvinit/sysvinit/realpath.patch b/poky/meta/recipes-core/sysvinit/sysvinit/realpath.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/sysvinit/sysvinit/realpath.patch
rename to poky/meta/recipes-core/sysvinit/sysvinit/realpath.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb b/poky/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
rename to poky/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/udev/eudev/0014-Revert-rules-remove-firmware-loading-rules.patch b/poky/meta/recipes-core/udev/eudev/0014-Revert-rules-remove-firmware-loading-rules.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/udev/eudev/0014-Revert-rules-remove-firmware-loading-rules.patch
rename to poky/meta/recipes-core/udev/eudev/0014-Revert-rules-remove-firmware-loading-rules.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/udev/eudev/Revert-udev-remove-userspace-firmware-loading-suppor.patch b/poky/meta/recipes-core/udev/eudev/Revert-udev-remove-userspace-firmware-loading-suppor.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/udev/eudev/Revert-udev-remove-userspace-firmware-loading-suppor.patch
rename to poky/meta/recipes-core/udev/eudev/Revert-udev-remove-userspace-firmware-loading-suppor.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/udev/eudev/devfs-udev.rules b/poky/meta/recipes-core/udev/eudev/devfs-udev.rules
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/udev/eudev/devfs-udev.rules
rename to poky/meta/recipes-core/udev/eudev/devfs-udev.rules
diff --git a/import-layers/yocto-poky/meta/recipes-core/udev/eudev/init b/poky/meta/recipes-core/udev/eudev/init
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/udev/eudev/init
rename to poky/meta/recipes-core/udev/eudev/init
diff --git a/import-layers/yocto-poky/meta/recipes-core/udev/eudev/links.conf b/poky/meta/recipes-core/udev/eudev/links.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/udev/eudev/links.conf
rename to poky/meta/recipes-core/udev/eudev/links.conf
diff --git a/import-layers/yocto-poky/meta/recipes-core/udev/eudev/local.rules b/poky/meta/recipes-core/udev/eudev/local.rules
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/udev/eudev/local.rules
rename to poky/meta/recipes-core/udev/eudev/local.rules
diff --git a/import-layers/yocto-poky/meta/recipes-core/udev/eudev/permissions.rules b/poky/meta/recipes-core/udev/eudev/permissions.rules
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/udev/eudev/permissions.rules
rename to poky/meta/recipes-core/udev/eudev/permissions.rules
diff --git a/import-layers/yocto-poky/meta/recipes-core/udev/eudev/run.rules b/poky/meta/recipes-core/udev/eudev/run.rules
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/udev/eudev/run.rules
rename to poky/meta/recipes-core/udev/eudev/run.rules
diff --git a/import-layers/yocto-poky/meta/recipes-core/udev/eudev/udev.rules b/poky/meta/recipes-core/udev/eudev/udev.rules
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/udev/eudev/udev.rules
rename to poky/meta/recipes-core/udev/eudev/udev.rules
diff --git a/import-layers/yocto-poky/meta/recipes-core/udev/eudev_3.2.5.bb b/poky/meta/recipes-core/udev/eudev_3.2.5.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/udev/eudev_3.2.5.bb
rename to poky/meta/recipes-core/udev/eudev_3.2.5.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/udev/udev-extraconf/automount.rules b/poky/meta/recipes-core/udev/udev-extraconf/automount.rules
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/udev/udev-extraconf/automount.rules
rename to poky/meta/recipes-core/udev/udev-extraconf/automount.rules
diff --git a/import-layers/yocto-poky/meta/recipes-core/udev/udev-extraconf/autonet.rules b/poky/meta/recipes-core/udev/udev-extraconf/autonet.rules
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/udev/udev-extraconf/autonet.rules
rename to poky/meta/recipes-core/udev/udev-extraconf/autonet.rules
diff --git a/import-layers/yocto-poky/meta/recipes-core/udev/udev-extraconf/localextra.rules b/poky/meta/recipes-core/udev/udev-extraconf/localextra.rules
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/udev/udev-extraconf/localextra.rules
rename to poky/meta/recipes-core/udev/udev-extraconf/localextra.rules
diff --git a/import-layers/yocto-poky/meta/recipes-core/udev/udev-extraconf/mount.blacklist b/poky/meta/recipes-core/udev/udev-extraconf/mount.blacklist
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/udev/udev-extraconf/mount.blacklist
rename to poky/meta/recipes-core/udev/udev-extraconf/mount.blacklist
diff --git a/import-layers/yocto-poky/meta/recipes-core/udev/udev-extraconf/mount.sh b/poky/meta/recipes-core/udev/udev-extraconf/mount.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/udev/udev-extraconf/mount.sh
rename to poky/meta/recipes-core/udev/udev-extraconf/mount.sh
diff --git a/import-layers/yocto-poky/meta/recipes-core/udev/udev-extraconf/network.sh b/poky/meta/recipes-core/udev/udev-extraconf/network.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/udev/udev-extraconf/network.sh
rename to poky/meta/recipes-core/udev/udev-extraconf/network.sh
diff --git a/import-layers/yocto-poky/meta/recipes-core/udev/udev-extraconf_1.1.bb b/poky/meta/recipes-core/udev/udev-extraconf_1.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/udev/udev-extraconf_1.1.bb
rename to poky/meta/recipes-core/udev/udev-extraconf_1.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/update-rc.d/update-rc.d/add-verbose.patch b/poky/meta/recipes-core/update-rc.d/update-rc.d/add-verbose.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/update-rc.d/update-rc.d/add-verbose.patch
rename to poky/meta/recipes-core/update-rc.d/update-rc.d/add-verbose.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/update-rc.d/update-rc.d/check-if-symlinks-are-valid.patch b/poky/meta/recipes-core/update-rc.d/update-rc.d/check-if-symlinks-are-valid.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/update-rc.d/update-rc.d/check-if-symlinks-are-valid.patch
rename to poky/meta/recipes-core/update-rc.d/update-rc.d/check-if-symlinks-are-valid.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/update-rc.d/update-rc.d/fix-to-handle-priority-numbers-correctly.patch b/poky/meta/recipes-core/update-rc.d/update-rc.d/fix-to-handle-priority-numbers-correctly.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/update-rc.d/update-rc.d/fix-to-handle-priority-numbers-correctly.patch
rename to poky/meta/recipes-core/update-rc.d/update-rc.d/fix-to-handle-priority-numbers-correctly.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb b/poky/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb
rename to poky/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/util-linux/util-linux.inc b/poky/meta/recipes-core/util-linux/util-linux.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/util-linux/util-linux.inc
rename to poky/meta/recipes-core/util-linux/util-linux.inc
diff --git a/import-layers/yocto-poky/meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch b/poky/meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch
rename to poky/meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch b/poky/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch
rename to poky/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/util-linux/util-linux/display_testname_for_subtest.patch b/poky/meta/recipes-core/util-linux/util-linux/display_testname_for_subtest.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/util-linux/util-linux/display_testname_for_subtest.patch
rename to poky/meta/recipes-core/util-linux/util-linux/display_testname_for_subtest.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/util-linux/util-linux/ptest.patch b/poky/meta/recipes-core/util-linux/util-linux/ptest.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/util-linux/util-linux/ptest.patch
rename to poky/meta/recipes-core/util-linux/util-linux/ptest.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/util-linux/util-linux/run-ptest b/poky/meta/recipes-core/util-linux/util-linux/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/util-linux/util-linux/run-ptest
rename to poky/meta/recipes-core/util-linux/util-linux/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-core/util-linux/util-linux/runuser-l.pamd b/poky/meta/recipes-core/util-linux/util-linux/runuser-l.pamd
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/util-linux/util-linux/runuser-l.pamd
rename to poky/meta/recipes-core/util-linux/util-linux/runuser-l.pamd
diff --git a/import-layers/yocto-poky/meta/recipes-core/util-linux/util-linux/runuser.pamd b/poky/meta/recipes-core/util-linux/util-linux/runuser.pamd
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/util-linux/util-linux/runuser.pamd
rename to poky/meta/recipes-core/util-linux/util-linux/runuser.pamd
diff --git a/import-layers/yocto-poky/meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch b/poky/meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch
rename to poky/meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/util-linux/util-linux_2.32.bb b/poky/meta/recipes-core/util-linux/util-linux_2.32.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/util-linux/util-linux_2.32.bb
rename to poky/meta/recipes-core/util-linux/util-linux_2.32.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/volatile-binds/files/COPYING.MIT b/poky/meta/recipes-core/volatile-binds/files/COPYING.MIT
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/volatile-binds/files/COPYING.MIT
rename to poky/meta/recipes-core/volatile-binds/files/COPYING.MIT
diff --git a/import-layers/yocto-poky/meta/recipes-core/volatile-binds/files/mount-copybind b/poky/meta/recipes-core/volatile-binds/files/mount-copybind
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/volatile-binds/files/mount-copybind
rename to poky/meta/recipes-core/volatile-binds/files/mount-copybind
diff --git a/import-layers/yocto-poky/meta/recipes-core/volatile-binds/files/volatile-binds.service.in b/poky/meta/recipes-core/volatile-binds/files/volatile-binds.service.in
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/volatile-binds/files/volatile-binds.service.in
rename to poky/meta/recipes-core/volatile-binds/files/volatile-binds.service.in
diff --git a/import-layers/yocto-poky/meta/recipes-core/volatile-binds/volatile-binds.bb b/poky/meta/recipes-core/volatile-binds/volatile-binds.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/volatile-binds/volatile-binds.bb
rename to poky/meta/recipes-core/volatile-binds/volatile-binds.bb
diff --git a/import-layers/yocto-poky/meta/recipes-core/zlib/site_config/headers b/poky/meta/recipes-core/zlib/site_config/headers
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/zlib/site_config/headers
rename to poky/meta/recipes-core/zlib/site_config/headers
diff --git a/import-layers/yocto-poky/meta/recipes-core/zlib/zlib-1.2.11/Makefile-runtests.patch b/poky/meta/recipes-core/zlib/zlib-1.2.11/Makefile-runtests.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/zlib/zlib-1.2.11/Makefile-runtests.patch
rename to poky/meta/recipes-core/zlib/zlib-1.2.11/Makefile-runtests.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/zlib/zlib-1.2.11/ldflags-tests.patch b/poky/meta/recipes-core/zlib/zlib-1.2.11/ldflags-tests.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/zlib/zlib-1.2.11/ldflags-tests.patch
rename to poky/meta/recipes-core/zlib/zlib-1.2.11/ldflags-tests.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/zlib/zlib-1.2.11/remove.ldconfig.call.patch b/poky/meta/recipes-core/zlib/zlib-1.2.11/remove.ldconfig.call.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/zlib/zlib-1.2.11/remove.ldconfig.call.patch
rename to poky/meta/recipes-core/zlib/zlib-1.2.11/remove.ldconfig.call.patch
diff --git a/import-layers/yocto-poky/meta/recipes-core/zlib/zlib-1.2.11/run-ptest b/poky/meta/recipes-core/zlib/zlib-1.2.11/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/zlib/zlib-1.2.11/run-ptest
rename to poky/meta/recipes-core/zlib/zlib-1.2.11/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-core/zlib/zlib_1.2.11.bb b/poky/meta/recipes-core/zlib/zlib_1.2.11.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-core/zlib/zlib_1.2.11.bb
rename to poky/meta/recipes-core/zlib/zlib_1.2.11.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/apt/apt-native.inc b/poky/meta/recipes-devtools/apt/apt-native.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/apt/apt-native.inc
rename to poky/meta/recipes-devtools/apt/apt-native.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/apt/apt-native_1.2.24.bb b/poky/meta/recipes-devtools/apt/apt-native_1.2.24.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/apt/apt-native_1.2.24.bb
rename to poky/meta/recipes-devtools/apt/apt-native_1.2.24.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/apt/apt-package.inc b/poky/meta/recipes-devtools/apt/apt-package.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/apt/apt-package.inc
rename to poky/meta/recipes-devtools/apt/apt-package.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/apt/apt.inc b/poky/meta/recipes-devtools/apt/apt.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/apt/apt.inc
rename to poky/meta/recipes-devtools/apt/apt.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch b/poky/meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch
rename to poky/meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/apt/apt/0001-apt-1.2.12-Fix-musl-build.patch b/poky/meta/recipes-devtools/apt/apt/0001-apt-1.2.12-Fix-musl-build.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/apt/apt/0001-apt-1.2.12-Fix-musl-build.patch
rename to poky/meta/recipes-devtools/apt/apt/0001-apt-1.2.12-Fix-musl-build.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/apt/apt/0001-environment.mak-musl-based-systems-can-generate-shar.patch b/poky/meta/recipes-devtools/apt/apt/0001-environment.mak-musl-based-systems-can-generate-shar.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/apt/apt/0001-environment.mak-musl-based-systems-can-generate-shar.patch
rename to poky/meta/recipes-devtools/apt/apt/0001-environment.mak-musl-based-systems-can-generate-shar.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/apt/apt/0001-fix-the-gcc-version-check.patch b/poky/meta/recipes-devtools/apt/apt/0001-fix-the-gcc-version-check.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/apt/apt/0001-fix-the-gcc-version-check.patch
rename to poky/meta/recipes-devtools/apt/apt/0001-fix-the-gcc-version-check.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/apt/apt/0001-remove-Wsuggest-attribute-from-CFLAGS.patch b/poky/meta/recipes-devtools/apt/apt/0001-remove-Wsuggest-attribute-from-CFLAGS.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/apt/apt/0001-remove-Wsuggest-attribute-from-CFLAGS.patch
rename to poky/meta/recipes-devtools/apt/apt/0001-remove-Wsuggest-attribute-from-CFLAGS.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/apt/apt/disable-configure-in-makefile.patch b/poky/meta/recipes-devtools/apt/apt/disable-configure-in-makefile.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/apt/apt/disable-configure-in-makefile.patch
rename to poky/meta/recipes-devtools/apt/apt/disable-configure-in-makefile.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/apt/apt/disable-test.patch b/poky/meta/recipes-devtools/apt/apt/disable-test.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/apt/apt/disable-test.patch
rename to poky/meta/recipes-devtools/apt/apt/disable-test.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/apt/apt/fix-gcc-4.6-null-not-defined.patch b/poky/meta/recipes-devtools/apt/apt/fix-gcc-4.6-null-not-defined.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/apt/apt/fix-gcc-4.6-null-not-defined.patch
rename to poky/meta/recipes-devtools/apt/apt/fix-gcc-4.6-null-not-defined.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/apt/apt/gcc_4.x_Revert-avoid-changing-the-global-LC_TIME-for-Release.patch b/poky/meta/recipes-devtools/apt/apt/gcc_4.x_Revert-avoid-changing-the-global-LC_TIME-for-Release.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/apt/apt/gcc_4.x_Revert-avoid-changing-the-global-LC_TIME-for-Release.patch
rename to poky/meta/recipes-devtools/apt/apt/gcc_4.x_Revert-avoid-changing-the-global-LC_TIME-for-Release.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/apt/apt/gcc_4.x_Revert-use-de-localed-std-put_time-instead-rolling-o.patch b/poky/meta/recipes-devtools/apt/apt/gcc_4.x_Revert-use-de-localed-std-put_time-instead-rolling-o.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/apt/apt/gcc_4.x_Revert-use-de-localed-std-put_time-instead-rolling-o.patch
rename to poky/meta/recipes-devtools/apt/apt/gcc_4.x_Revert-use-de-localed-std-put_time-instead-rolling-o.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/apt/apt/gcc_4.x_apt-pkg-contrib-strutl.cc-Include-array-header.patch b/poky/meta/recipes-devtools/apt/apt/gcc_4.x_apt-pkg-contrib-strutl.cc-Include-array-header.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/apt/apt/gcc_4.x_apt-pkg-contrib-strutl.cc-Include-array-header.patch
rename to poky/meta/recipes-devtools/apt/apt/gcc_4.x_apt-pkg-contrib-strutl.cc-Include-array-header.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/apt/apt/makerace.patch b/poky/meta/recipes-devtools/apt/apt/makerace.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/apt/apt/makerace.patch
rename to poky/meta/recipes-devtools/apt/apt/makerace.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/apt/apt/no-nls-dpkg.patch b/poky/meta/recipes-devtools/apt/apt/no-nls-dpkg.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/apt/apt/no-nls-dpkg.patch
rename to poky/meta/recipes-devtools/apt/apt/no-nls-dpkg.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/apt/apt/noconfigure.patch b/poky/meta/recipes-devtools/apt/apt/noconfigure.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/apt/apt/noconfigure.patch
rename to poky/meta/recipes-devtools/apt/apt/noconfigure.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/apt/apt/nodoc.patch b/poky/meta/recipes-devtools/apt/apt/nodoc.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/apt/apt/nodoc.patch
rename to poky/meta/recipes-devtools/apt/apt/nodoc.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/apt/apt/truncate-filename.patch b/poky/meta/recipes-devtools/apt/apt/truncate-filename.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/apt/apt/truncate-filename.patch
rename to poky/meta/recipes-devtools/apt/apt/truncate-filename.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/apt/apt/use-host.patch b/poky/meta/recipes-devtools/apt/apt/use-host.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/apt/apt/use-host.patch
rename to poky/meta/recipes-devtools/apt/apt/use-host.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/apt/apt_1.2.24.bb b/poky/meta/recipes-devtools/apt/apt_1.2.24.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/apt/apt_1.2.24.bb
rename to poky/meta/recipes-devtools/apt/apt_1.2.24.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/apt/files/apt.conf b/poky/meta/recipes-devtools/apt/files/apt.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/apt/files/apt.conf
rename to poky/meta/recipes-devtools/apt/files/apt.conf
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/apt/files/db_linking_hack.patch b/poky/meta/recipes-devtools/apt/files/db_linking_hack.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/apt/files/db_linking_hack.patch
rename to poky/meta/recipes-devtools/apt/files/db_linking_hack.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/apt/files/environment.patch b/poky/meta/recipes-devtools/apt/files/environment.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/apt/files/environment.patch
rename to poky/meta/recipes-devtools/apt/files/environment.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/apt/files/no-curl.patch b/poky/meta/recipes-devtools/apt/files/no-curl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/apt/files/no-curl.patch
rename to poky/meta/recipes-devtools/apt/files/no-curl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/autoconf-archive/autoconf-archive_2018.03.13.bb b/poky/meta/recipes-devtools/autoconf-archive/autoconf-archive_2018.03.13.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/autoconf-archive/autoconf-archive_2018.03.13.bb
rename to poky/meta/recipes-devtools/autoconf-archive/autoconf-archive_2018.03.13.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/autoconf/autoconf.inc b/poky/meta/recipes-devtools/autoconf/autoconf.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/autoconf/autoconf.inc
rename to poky/meta/recipes-devtools/autoconf/autoconf.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/autoconf/autoconf/AC_HEADER_MAJOR-port-to-glibc-2.25.patch b/poky/meta/recipes-devtools/autoconf/autoconf/AC_HEADER_MAJOR-port-to-glibc-2.25.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/autoconf/autoconf/AC_HEADER_MAJOR-port-to-glibc-2.25.patch
rename to poky/meta/recipes-devtools/autoconf/autoconf/AC_HEADER_MAJOR-port-to-glibc-2.25.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/autoconf/autoconf/add_musl_config.patch b/poky/meta/recipes-devtools/autoconf/autoconf/add_musl_config.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/autoconf/autoconf/add_musl_config.patch
rename to poky/meta/recipes-devtools/autoconf/autoconf/add_musl_config.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/autoconf/autoconf/autoconf-replace-w-option-in-shebangs-with-modern-use-warnings.patch b/poky/meta/recipes-devtools/autoconf/autoconf/autoconf-replace-w-option-in-shebangs-with-modern-use-warnings.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/autoconf/autoconf/autoconf-replace-w-option-in-shebangs-with-modern-use-warnings.patch
rename to poky/meta/recipes-devtools/autoconf/autoconf/autoconf-replace-w-option-in-shebangs-with-modern-use-warnings.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch b/poky/meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch
rename to poky/meta/recipes-devtools/autoconf/autoconf/autoreconf-exclude.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/autoconf/autoconf/autoreconf-gnuconfigize.patch b/poky/meta/recipes-devtools/autoconf/autoconf/autoreconf-gnuconfigize.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/autoconf/autoconf/autoreconf-gnuconfigize.patch
rename to poky/meta/recipes-devtools/autoconf/autoconf/autoreconf-gnuconfigize.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/autoconf/autoconf/autotest-automake-result-format.patch b/poky/meta/recipes-devtools/autoconf/autoconf/autotest-automake-result-format.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/autoconf/autoconf/autotest-automake-result-format.patch
rename to poky/meta/recipes-devtools/autoconf/autoconf/autotest-automake-result-format.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/autoconf/autoconf/check-automake-cross-warning.patch b/poky/meta/recipes-devtools/autoconf/autoconf/check-automake-cross-warning.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/autoconf/autoconf/check-automake-cross-warning.patch
rename to poky/meta/recipes-devtools/autoconf/autoconf/check-automake-cross-warning.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/autoconf/autoconf/config_site.patch b/poky/meta/recipes-devtools/autoconf/autoconf/config_site.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/autoconf/autoconf/config_site.patch
rename to poky/meta/recipes-devtools/autoconf/autoconf/config_site.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/autoconf/autoconf/fix_path_xtra.patch b/poky/meta/recipes-devtools/autoconf/autoconf/fix_path_xtra.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/autoconf/autoconf/fix_path_xtra.patch
rename to poky/meta/recipes-devtools/autoconf/autoconf/fix_path_xtra.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/autoconf/autoconf/performance.patch b/poky/meta/recipes-devtools/autoconf/autoconf/performance.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/autoconf/autoconf/performance.patch
rename to poky/meta/recipes-devtools/autoconf/autoconf/performance.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/autoconf/autoconf/preferbash.patch b/poky/meta/recipes-devtools/autoconf/autoconf/preferbash.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/autoconf/autoconf/preferbash.patch
rename to poky/meta/recipes-devtools/autoconf/autoconf/preferbash.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/autoconf/autoconf/program_prefix.patch b/poky/meta/recipes-devtools/autoconf/autoconf/program_prefix.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/autoconf/autoconf/program_prefix.patch
rename to poky/meta/recipes-devtools/autoconf/autoconf/program_prefix.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/autoconf/autoconf/remove-usr-local-lib-from-m4.patch b/poky/meta/recipes-devtools/autoconf/autoconf/remove-usr-local-lib-from-m4.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/autoconf/autoconf/remove-usr-local-lib-from-m4.patch
rename to poky/meta/recipes-devtools/autoconf/autoconf/remove-usr-local-lib-from-m4.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/autoconf/autoconf_2.69.bb b/poky/meta/recipes-devtools/autoconf/autoconf_2.69.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/autoconf/autoconf_2.69.bb
rename to poky/meta/recipes-devtools/autoconf/autoconf_2.69.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/automake/automake.inc b/poky/meta/recipes-devtools/automake/automake.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/automake/automake.inc
rename to poky/meta/recipes-devtools/automake/automake.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/automake/automake/0001-automake-Add-default-libtool_tag-to-cppasm.patch b/poky/meta/recipes-devtools/automake/automake/0001-automake-Add-default-libtool_tag-to-cppasm.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/automake/automake/0001-automake-Add-default-libtool_tag-to-cppasm.patch
rename to poky/meta/recipes-devtools/automake/automake/0001-automake-Add-default-libtool_tag-to-cppasm.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch b/poky/meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch
rename to poky/meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/automake/automake/buildtest.patch b/poky/meta/recipes-devtools/automake/automake/buildtest.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/automake/automake/buildtest.patch
rename to poky/meta/recipes-devtools/automake/automake/buildtest.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch b/poky/meta/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch
rename to poky/meta/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/automake/automake/performance.patch b/poky/meta/recipes-devtools/automake/automake/performance.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/automake/automake/performance.patch
rename to poky/meta/recipes-devtools/automake/automake/performance.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/automake/automake/python-libdir.patch b/poky/meta/recipes-devtools/automake/automake/python-libdir.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/automake/automake/python-libdir.patch
rename to poky/meta/recipes-devtools/automake/automake/python-libdir.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/automake/automake_1.15.1.bb b/poky/meta/recipes-devtools/automake/automake_1.15.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/automake/automake_1.15.1.bb
rename to poky/meta/recipes-devtools/automake/automake_1.15.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils-2.30.inc b/poky/meta/recipes-devtools/binutils/binutils-2.30.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils-2.30.inc
rename to poky/meta/recipes-devtools/binutils/binutils-2.30.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils-cross-canadian.inc b/poky/meta/recipes-devtools/binutils/binutils-cross-canadian.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils-cross-canadian.inc
rename to poky/meta/recipes-devtools/binutils/binutils-cross-canadian.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils-cross-canadian_2.30.bb b/poky/meta/recipes-devtools/binutils/binutils-cross-canadian_2.30.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils-cross-canadian_2.30.bb
rename to poky/meta/recipes-devtools/binutils/binutils-cross-canadian_2.30.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils-cross.inc b/poky/meta/recipes-devtools/binutils/binutils-cross.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils-cross.inc
rename to poky/meta/recipes-devtools/binutils/binutils-cross.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils-cross_2.30.bb b/poky/meta/recipes-devtools/binutils/binutils-cross_2.30.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils-cross_2.30.bb
rename to poky/meta/recipes-devtools/binutils/binutils-cross_2.30.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils-crosssdk_2.30.bb b/poky/meta/recipes-devtools/binutils/binutils-crosssdk_2.30.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils-crosssdk_2.30.bb
rename to poky/meta/recipes-devtools/binutils/binutils-crosssdk_2.30.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils.inc b/poky/meta/recipes-devtools/binutils/binutils.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils.inc
rename to poky/meta/recipes-devtools/binutils/binutils.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch b/poky/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch
rename to poky/meta/recipes-devtools/binutils/binutils/0001-binutils-crosssdk-Generate-relocatable-SDKs.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch b/poky/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch
rename to poky/meta/recipes-devtools/binutils/binutils/0002-binutils-cross-Do-not-generate-linker-script-directo.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch b/poky/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch
rename to poky/meta/recipes-devtools/binutils/binutils/0003-configure-widen-the-regexp-for-SH-architectures.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch b/poky/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch
rename to poky/meta/recipes-devtools/binutils/binutils/0004-Point-scripts-location-to-libdir.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch b/poky/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
rename to poky/meta/recipes-devtools/binutils/binutils/0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch b/poky/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch
rename to poky/meta/recipes-devtools/binutils/binutils/0006-Use-libtool-2.4.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch b/poky/meta/recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch
rename to poky/meta/recipes-devtools/binutils/binutils/0007-Add-the-armv5e-architecture-to-binutils.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch b/poky/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch
rename to poky/meta/recipes-devtools/binutils/binutils/0008-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch b/poky/meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch
rename to poky/meta/recipes-devtools/binutils/binutils/0009-warn-for-uses-of-system-directories-when-cross-linki.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch b/poky/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch
rename to poky/meta/recipes-devtools/binutils/binutils/0010-Fix-rpath-in-libtool-when-sysroot-is-enabled.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch b/poky/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch
rename to poky/meta/recipes-devtools/binutils/binutils/0011-Change-default-emulation-for-mips64-linux.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch b/poky/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch
rename to poky/meta/recipes-devtools/binutils/binutils/0012-Add-support-for-Netlogic-XLP.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch b/poky/meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch
rename to poky/meta/recipes-devtools/binutils/binutils/0013-fix-the-incorrect-assembling-for-ppc-wait-mnemonic.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch b/poky/meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch
rename to poky/meta/recipes-devtools/binutils/binutils/0014-Detect-64-bit-MIPS-targets.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch b/poky/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch
rename to poky/meta/recipes-devtools/binutils/binutils/0015-sync-with-OE-libtool-changes.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils_2.30.bb b/poky/meta/recipes-devtools/binutils/binutils_2.30.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/binutils/binutils_2.30.bb
rename to poky/meta/recipes-devtools/binutils/binutils_2.30.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/bison/bison/0001-Unset-need_charset_alias-when-building-for-musl.patch b/poky/meta/recipes-devtools/bison/bison/0001-Unset-need_charset_alias-when-building-for-musl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/bison/bison/0001-Unset-need_charset_alias-when-building-for-musl.patch
rename to poky/meta/recipes-devtools/bison/bison/0001-Unset-need_charset_alias-when-building-for-musl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/bison/bison/0001-src-local.mk-fix-parallel-issue.patch b/poky/meta/recipes-devtools/bison/bison/0001-src-local.mk-fix-parallel-issue.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/bison/bison/0001-src-local.mk-fix-parallel-issue.patch
rename to poky/meta/recipes-devtools/bison/bison/0001-src-local.mk-fix-parallel-issue.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/bison/bison/add-with-bisonlocaledir.patch b/poky/meta/recipes-devtools/bison/bison/add-with-bisonlocaledir.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/bison/bison/add-with-bisonlocaledir.patch
rename to poky/meta/recipes-devtools/bison/bison/add-with-bisonlocaledir.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch.patch b/poky/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch.patch
rename to poky/meta/recipes-devtools/bison/bison/dont-depend-on-help2man.patch.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/bison/bison_3.0.4.bb b/poky/meta/recipes-devtools/bison/bison_3.0.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/bison/bison_3.0.4.bb
rename to poky/meta/recipes-devtools/bison/bison_3.0.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/bootchart2/bootchart2/0001-Fixed-Missing-default-value-for-BOOTLOG_DEST.patch b/poky/meta/recipes-devtools/bootchart2/bootchart2/0001-Fixed-Missing-default-value-for-BOOTLOG_DEST.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/bootchart2/bootchart2/0001-Fixed-Missing-default-value-for-BOOTLOG_DEST.patch
rename to poky/meta/recipes-devtools/bootchart2/bootchart2/0001-Fixed-Missing-default-value-for-BOOTLOG_DEST.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/bootchart2/bootchart2/0001-collector-Allocate-space-on-heap-for-chunks.patch b/poky/meta/recipes-devtools/bootchart2/bootchart2/0001-collector-Allocate-space-on-heap-for-chunks.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/bootchart2/bootchart2/0001-collector-Allocate-space-on-heap-for-chunks.patch
rename to poky/meta/recipes-devtools/bootchart2/bootchart2/0001-collector-Allocate-space-on-heap-for-chunks.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/bootchart2/bootchart2/bootchartd_stop.sh b/poky/meta/recipes-devtools/bootchart2/bootchart2/bootchartd_stop.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/bootchart2/bootchart2/bootchartd_stop.sh
rename to poky/meta/recipes-devtools/bootchart2/bootchart2/bootchartd_stop.sh
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb b/poky/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb
rename to poky/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Fix-build-with-musl-missing-header-include-for-dev_t.patch b/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Fix-build-with-musl-missing-header-include-for-dev_t.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Fix-build-with-musl-missing-header-include-for-dev_t.patch
rename to poky/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Fix-build-with-musl-missing-header-include-for-dev_t.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-build-mktables-using-native-gcc.patch b/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-build-mktables-using-native-gcc.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-build-mktables-using-native-gcc.patch
rename to poky/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Makefile-build-mktables-using-native-gcc.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.13.3.bb b/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.13.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.13.3.bb
rename to poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_4.13.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/build-compare/build-compare_git.bb b/poky/meta/recipes-devtools/build-compare/build-compare_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/build-compare/build-compare_git.bb
rename to poky/meta/recipes-devtools/build-compare/build-compare_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/build-compare/files/0001-Add-support-for-deb-and-ipk-packaging.patch b/poky/meta/recipes-devtools/build-compare/files/0001-Add-support-for-deb-and-ipk-packaging.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/build-compare/files/0001-Add-support-for-deb-and-ipk-packaging.patch
rename to poky/meta/recipes-devtools/build-compare/files/0001-Add-support-for-deb-and-ipk-packaging.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/build-compare/files/Ignore-DWARF-sections.patch b/poky/meta/recipes-devtools/build-compare/files/Ignore-DWARF-sections.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/build-compare/files/Ignore-DWARF-sections.patch
rename to poky/meta/recipes-devtools/build-compare/files/Ignore-DWARF-sections.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/build-compare/files/Rename-rpm-check.sh-to-pkg-diff.sh.patch b/poky/meta/recipes-devtools/build-compare/files/Rename-rpm-check.sh-to-pkg-diff.sh.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/build-compare/files/Rename-rpm-check.sh-to-pkg-diff.sh.patch
rename to poky/meta/recipes-devtools/build-compare/files/Rename-rpm-check.sh-to-pkg-diff.sh.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/build-compare/files/functions.sh-improve-deb-and-ipk-checking.patch b/poky/meta/recipes-devtools/build-compare/files/functions.sh-improve-deb-and-ipk-checking.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/build-compare/files/functions.sh-improve-deb-and-ipk-checking.patch
rename to poky/meta/recipes-devtools/build-compare/files/functions.sh-improve-deb-and-ipk-checking.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/build-compare/files/functions.sh-remove-space-at-head.patch b/poky/meta/recipes-devtools/build-compare/files/functions.sh-remove-space-at-head.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/build-compare/files/functions.sh-remove-space-at-head.patch
rename to poky/meta/recipes-devtools/build-compare/files/functions.sh-remove-space-at-head.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/build-compare/files/functions.sh-run-rpm-once-to-make-it-faster.patch b/poky/meta/recipes-devtools/build-compare/files/functions.sh-run-rpm-once-to-make-it-faster.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/build-compare/files/functions.sh-run-rpm-once-to-make-it-faster.patch
rename to poky/meta/recipes-devtools/build-compare/files/functions.sh-run-rpm-once-to-make-it-faster.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/build-compare/files/pkg-diff.sh-check-for-fifo-named-pipe.patch b/poky/meta/recipes-devtools/build-compare/files/pkg-diff.sh-check-for-fifo-named-pipe.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/build-compare/files/pkg-diff.sh-check-for-fifo-named-pipe.patch
rename to poky/meta/recipes-devtools/build-compare/files/pkg-diff.sh-check-for-fifo-named-pipe.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/build-compare/files/pkg-diff.sh-check_single_file-return-at-once-when-sa.patch b/poky/meta/recipes-devtools/build-compare/files/pkg-diff.sh-check_single_file-return-at-once-when-sa.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/build-compare/files/pkg-diff.sh-check_single_file-return-at-once-when-sa.patch
rename to poky/meta/recipes-devtools/build-compare/files/pkg-diff.sh-check_single_file-return-at-once-when-sa.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/build-compare/files/pkg-diff.sh-remove-space-in-the-end-for-ftype.patch b/poky/meta/recipes-devtools/build-compare/files/pkg-diff.sh-remove-space-in-the-end-for-ftype.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/build-compare/files/pkg-diff.sh-remove-space-in-the-end-for-ftype.patch
rename to poky/meta/recipes-devtools/build-compare/files/pkg-diff.sh-remove-space-in-the-end-for-ftype.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/ccache/ccache.inc b/poky/meta/recipes-devtools/ccache/ccache.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/ccache/ccache.inc
rename to poky/meta/recipes-devtools/ccache/ccache.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/ccache/ccache_3.3.5.bb b/poky/meta/recipes-devtools/ccache/ccache_3.3.5.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/ccache/ccache_3.3.5.bb
rename to poky/meta/recipes-devtools/ccache/ccache_3.3.5.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/ccache/files/0002-dev.mk.in-fix-file-name-too-long.patch b/poky/meta/recipes-devtools/ccache/files/0002-dev.mk.in-fix-file-name-too-long.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/ccache/files/0002-dev.mk.in-fix-file-name-too-long.patch
rename to poky/meta/recipes-devtools/ccache/files/0002-dev.mk.in-fix-file-name-too-long.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/ccache/files/Revert-Create-man-page-in-the-make-install-from-git-.patch b/poky/meta/recipes-devtools/ccache/files/Revert-Create-man-page-in-the-make-install-from-git-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/ccache/files/Revert-Create-man-page-in-the-make-install-from-git-.patch
rename to poky/meta/recipes-devtools/ccache/files/Revert-Create-man-page-in-the-make-install-from-git-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb b/poky/meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb
rename to poky/meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/chrpath/chrpath/standarddoc.patch b/poky/meta/recipes-devtools/chrpath/chrpath/standarddoc.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/chrpath/chrpath/standarddoc.patch
rename to poky/meta/recipes-devtools/chrpath/chrpath/standarddoc.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/chrpath/chrpath_0.16.bb b/poky/meta/recipes-devtools/chrpath/chrpath_0.16.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/chrpath/chrpath_0.16.bb
rename to poky/meta/recipes-devtools/chrpath/chrpath_0.16.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake-native_3.10.3.bb b/poky/meta/recipes-devtools/cmake/cmake-native_3.10.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake-native_3.10.3.bb
rename to poky/meta/recipes-devtools/cmake/cmake-native_3.10.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake.inc b/poky/meta/recipes-devtools/cmake/cmake.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake.inc
rename to poky/meta/recipes-devtools/cmake/cmake.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake/0001-FindBoost-Boost-1.66.0-dependency-and-release-update.patch b/poky/meta/recipes-devtools/cmake/cmake/0001-FindBoost-Boost-1.66.0-dependency-and-release-update.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake/0001-FindBoost-Boost-1.66.0-dependency-and-release-update.patch
rename to poky/meta/recipes-devtools/cmake/cmake/0001-FindBoost-Boost-1.66.0-dependency-and-release-update.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake/0001-FindBoost-Fix-incorrect-alphabetisation-of-headers-l.patch b/poky/meta/recipes-devtools/cmake/cmake/0001-FindBoost-Fix-incorrect-alphabetisation-of-headers-l.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake/0001-FindBoost-Fix-incorrect-alphabetisation-of-headers-l.patch
rename to poky/meta/recipes-devtools/cmake/cmake/0001-FindBoost-Fix-incorrect-alphabetisation-of-headers-l.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake/0002-FindBoost-Implement-Architecture-and-Address-Model-t.patch b/poky/meta/recipes-devtools/cmake/cmake/0002-FindBoost-Implement-Architecture-and-Address-Model-t.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake/0002-FindBoost-Implement-Architecture-and-Address-Model-t.patch
rename to poky/meta/recipes-devtools/cmake/cmake/0002-FindBoost-Implement-Architecture-and-Address-Model-t.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake/0003-FindBoost-Search-for-upstream-packaged-libs-next-to-.patch b/poky/meta/recipes-devtools/cmake/cmake/0003-FindBoost-Search-for-upstream-packaged-libs-next-to-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake/0003-FindBoost-Search-for-upstream-packaged-libs-next-to-.patch
rename to poky/meta/recipes-devtools/cmake/cmake/0003-FindBoost-Search-for-upstream-packaged-libs-next-to-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake b/poky/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake
rename to poky/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake/cmake-Prevent-the-detection-of-Qt5.patch b/poky/meta/recipes-devtools/cmake/cmake/cmake-Prevent-the-detection-of-Qt5.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake/cmake-Prevent-the-detection-of-Qt5.patch
rename to poky/meta/recipes-devtools/cmake/cmake/cmake-Prevent-the-detection-of-Qt5.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake/cmlibarchive-disable-ext2fs.patch b/poky/meta/recipes-devtools/cmake/cmake/cmlibarchive-disable-ext2fs.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake/cmlibarchive-disable-ext2fs.patch
rename to poky/meta/recipes-devtools/cmake/cmake/cmlibarchive-disable-ext2fs.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake/environment.d-cmake.sh b/poky/meta/recipes-devtools/cmake/cmake/environment.d-cmake.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake/environment.d-cmake.sh
rename to poky/meta/recipes-devtools/cmake/cmake/environment.d-cmake.sh
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake/qt4-fail-silent.patch b/poky/meta/recipes-devtools/cmake/cmake/qt4-fail-silent.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake/qt4-fail-silent.patch
rename to poky/meta/recipes-devtools/cmake/cmake/qt4-fail-silent.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch b/poky/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch
rename to poky/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake_3.10.3.bb b/poky/meta/recipes-devtools/cmake/cmake_3.10.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/cmake/cmake_3.10.3.bb
rename to poky/meta/recipes-devtools/cmake/cmake_3.10.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Correctly-install-the-shared-library.patch b/poky/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Correctly-install-the-shared-library.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Correctly-install-the-shared-library.patch
rename to poky/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Correctly-install-the-shared-library.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch b/poky/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch
rename to poky/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb b/poky/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
rename to poky/meta/recipes-devtools/createrepo-c/createrepo-c_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/cve-check-tool/cve-check-tool_5.6.4.bb b/poky/meta/recipes-devtools/cve-check-tool/cve-check-tool_5.6.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/cve-check-tool/cve-check-tool_5.6.4.bb
rename to poky/meta/recipes-devtools/cve-check-tool/cve-check-tool_5.6.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/cve-check-tool/files/0001-Fix-freeing-memory-allocated-by-sqlite.patch b/poky/meta/recipes-devtools/cve-check-tool/files/0001-Fix-freeing-memory-allocated-by-sqlite.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/cve-check-tool/files/0001-Fix-freeing-memory-allocated-by-sqlite.patch
rename to poky/meta/recipes-devtools/cve-check-tool/files/0001-Fix-freeing-memory-allocated-by-sqlite.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/cve-check-tool/files/0001-curl-allow-overriding-default-CA-certificate-file.patch b/poky/meta/recipes-devtools/cve-check-tool/files/0001-curl-allow-overriding-default-CA-certificate-file.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/cve-check-tool/files/0001-curl-allow-overriding-default-CA-certificate-file.patch
rename to poky/meta/recipes-devtools/cve-check-tool/files/0001-curl-allow-overriding-default-CA-certificate-file.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/cve-check-tool/files/0001-print-progress-in-percent-when-downloading-CVE-db.patch b/poky/meta/recipes-devtools/cve-check-tool/files/0001-print-progress-in-percent-when-downloading-CVE-db.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/cve-check-tool/files/0001-print-progress-in-percent-when-downloading-CVE-db.patch
rename to poky/meta/recipes-devtools/cve-check-tool/files/0001-print-progress-in-percent-when-downloading-CVE-db.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/cve-check-tool/files/0001-update-Compare-computed-vs-expected-sha256-digit-str.patch b/poky/meta/recipes-devtools/cve-check-tool/files/0001-update-Compare-computed-vs-expected-sha256-digit-str.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/cve-check-tool/files/0001-update-Compare-computed-vs-expected-sha256-digit-str.patch
rename to poky/meta/recipes-devtools/cve-check-tool/files/0001-update-Compare-computed-vs-expected-sha256-digit-str.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/cve-check-tool/files/check-for-malloc_trim-before-using-it.patch b/poky/meta/recipes-devtools/cve-check-tool/files/check-for-malloc_trim-before-using-it.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/cve-check-tool/files/check-for-malloc_trim-before-using-it.patch
rename to poky/meta/recipes-devtools/cve-check-tool/files/check-for-malloc_trim-before-using-it.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/desktop-file-utils/desktop-file-utils-native_0.23.bb b/poky/meta/recipes-devtools/desktop-file-utils/desktop-file-utils-native_0.23.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/desktop-file-utils/desktop-file-utils-native_0.23.bb
rename to poky/meta/recipes-devtools/desktop-file-utils/desktop-file-utils-native_0.23.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/devel-config/distcc-config.bb b/poky/meta/recipes-devtools/devel-config/distcc-config.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/devel-config/distcc-config.bb
rename to poky/meta/recipes-devtools/devel-config/distcc-config.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/devel-config/distcc-config/distcc.sh b/poky/meta/recipes-devtools/devel-config/distcc-config/distcc.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/devel-config/distcc-config/distcc.sh
rename to poky/meta/recipes-devtools/devel-config/distcc-config/distcc.sh
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/devel-config/nfs-export-root.bb b/poky/meta/recipes-devtools/devel-config/nfs-export-root.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/devel-config/nfs-export-root.bb
rename to poky/meta/recipes-devtools/devel-config/nfs-export-root.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/devel-config/nfs-export-root/exports b/poky/meta/recipes-devtools/devel-config/nfs-export-root/exports
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/devel-config/nfs-export-root/exports
rename to poky/meta/recipes-devtools/devel-config/nfs-export-root/exports
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/diffstat/diffstat/run-ptest b/poky/meta/recipes-devtools/diffstat/diffstat/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/diffstat/diffstat/run-ptest
rename to poky/meta/recipes-devtools/diffstat/diffstat/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/diffstat/diffstat_1.61.bb b/poky/meta/recipes-devtools/diffstat/diffstat_1.61.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/diffstat/diffstat_1.61.bb
rename to poky/meta/recipes-devtools/diffstat/diffstat_1.61.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/distcc/distcc_3.2.bb b/poky/meta/recipes-devtools/distcc/distcc_3.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/distcc/distcc_3.2.bb
rename to poky/meta/recipes-devtools/distcc/distcc_3.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/distcc/files/0001-zeroconf-Include-fcntl.h.patch b/poky/meta/recipes-devtools/distcc/files/0001-zeroconf-Include-fcntl.h.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/distcc/files/0001-zeroconf-Include-fcntl.h.patch
rename to poky/meta/recipes-devtools/distcc/files/0001-zeroconf-Include-fcntl.h.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/distcc/files/default b/poky/meta/recipes-devtools/distcc/files/default
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/distcc/files/default
rename to poky/meta/recipes-devtools/distcc/files/default
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/distcc/files/distcc b/poky/meta/recipes-devtools/distcc/files/distcc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/distcc/files/distcc
rename to poky/meta/recipes-devtools/distcc/files/distcc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/distcc/files/distcc.service b/poky/meta/recipes-devtools/distcc/files/distcc.service
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/distcc/files/distcc.service
rename to poky/meta/recipes-devtools/distcc/files/distcc.service
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/distcc/files/distccmon-gnome.desktop b/poky/meta/recipes-devtools/distcc/files/distccmon-gnome.desktop
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/distcc/files/distccmon-gnome.desktop
rename to poky/meta/recipes-devtools/distcc/files/distccmon-gnome.desktop
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/distcc/files/separatebuilddir.patch b/poky/meta/recipes-devtools/distcc/files/separatebuilddir.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/distcc/files/separatebuilddir.patch
rename to poky/meta/recipes-devtools/distcc/files/separatebuilddir.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/dmidecode/dmidecode_3.1.bb b/poky/meta/recipes-devtools/dmidecode/dmidecode_3.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/dmidecode/dmidecode_3.1.bb
rename to poky/meta/recipes-devtools/dmidecode/dmidecode_3.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/dnf/dnf/0001-Corretly-install-tmpfiles.d-configuration.patch b/poky/meta/recipes-devtools/dnf/dnf/0001-Corretly-install-tmpfiles.d-configuration.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/dnf/dnf/0001-Corretly-install-tmpfiles.d-configuration.patch
rename to poky/meta/recipes-devtools/dnf/dnf/0001-Corretly-install-tmpfiles.d-configuration.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/dnf/dnf/0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch b/poky/meta/recipes-devtools/dnf/dnf/0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/dnf/dnf/0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch
rename to poky/meta/recipes-devtools/dnf/dnf/0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/dnf/dnf/0005-Do-not-prepend-installroot-to-logdir.patch b/poky/meta/recipes-devtools/dnf/dnf/0005-Do-not-prepend-installroot-to-logdir.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/dnf/dnf/0005-Do-not-prepend-installroot-to-logdir.patch
rename to poky/meta/recipes-devtools/dnf/dnf/0005-Do-not-prepend-installroot-to-logdir.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/dnf/dnf/0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch b/poky/meta/recipes-devtools/dnf/dnf/0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/dnf/dnf/0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch
rename to poky/meta/recipes-devtools/dnf/dnf/0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/dnf/dnf/0030-Run-python-scripts-using-env.patch b/poky/meta/recipes-devtools/dnf/dnf/0030-Run-python-scripts-using-env.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/dnf/dnf/0030-Run-python-scripts-using-env.patch
rename to poky/meta/recipes-devtools/dnf/dnf/0030-Run-python-scripts-using-env.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/dnf/dnf_2.7.5.bb b/poky/meta/recipes-devtools/dnf/dnf_2.7.5.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/dnf/dnf_2.7.5.bb
rename to poky/meta/recipes-devtools/dnf/dnf_2.7.5.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/LICENSE-OASIS b/poky/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/LICENSE-OASIS
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/LICENSE-OASIS
rename to poky/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/LICENSE-OASIS
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch b/poky/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch
rename to poky/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml.xml b/poky/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml.xml
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml.xml
rename to poky/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml.xml
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb b/poky/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb
rename to poky/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets/docbook-xsl-stylesheets-no-bashism-in-docbook-xsl-up.patch b/poky/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets/docbook-xsl-stylesheets-no-bashism-in-docbook-xsl-up.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets/docbook-xsl-stylesheets-no-bashism-in-docbook-xsl-up.patch
rename to poky/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets/docbook-xsl-stylesheets-no-bashism-in-docbook-xsl-up.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets/docbook-xsl.xml b/poky/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets/docbook-xsl.xml
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets/docbook-xsl.xml
rename to poky/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets/docbook-xsl.xml
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb b/poky/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb
rename to poky/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/dosfstools/dosfstools_4.1.bb b/poky/meta/recipes-devtools/dosfstools/dosfstools_4.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/dosfstools/dosfstools_4.1.bb
rename to poky/meta/recipes-devtools/dosfstools/dosfstools_4.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/dpkg/dpkg.inc b/poky/meta/recipes-devtools/dpkg/dpkg.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/dpkg/dpkg.inc
rename to poky/meta/recipes-devtools/dpkg/dpkg.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/dpkg/dpkg/0001-arch-Add-support-for-riscv64-CPU.patch b/poky/meta/recipes-devtools/dpkg/dpkg/0001-arch-Add-support-for-riscv64-CPU.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/dpkg/dpkg/0001-arch-Add-support-for-riscv64-CPU.patch
rename to poky/meta/recipes-devtools/dpkg/dpkg/0001-arch-Add-support-for-riscv64-CPU.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch b/poky/meta/recipes-devtools/dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch
rename to poky/meta/recipes-devtools/dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch b/poky/meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch
rename to poky/meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch b/poky/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch
rename to poky/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch b/poky/meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch
rename to poky/meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/dpkg/dpkg/0005-dpkg-compiler.m4-remove-Wvla.patch b/poky/meta/recipes-devtools/dpkg/dpkg/0005-dpkg-compiler.m4-remove-Wvla.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/dpkg/dpkg/0005-dpkg-compiler.m4-remove-Wvla.patch
rename to poky/meta/recipes-devtools/dpkg/dpkg/0005-dpkg-compiler.m4-remove-Wvla.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tripets.patch b/poky/meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tripets.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tripets.patch
rename to poky/meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tripets.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch b/poky/meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch
rename to poky/meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch b/poky/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch
rename to poky/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch b/poky/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch
rename to poky/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/dpkg/dpkg/dpkg-configure.service b/poky/meta/recipes-devtools/dpkg/dpkg/dpkg-configure.service
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/dpkg/dpkg/dpkg-configure.service
rename to poky/meta/recipes-devtools/dpkg/dpkg/dpkg-configure.service
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/dpkg/dpkg/glibc2.5-sync_file_range.patch b/poky/meta/recipes-devtools/dpkg/dpkg/glibc2.5-sync_file_range.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/dpkg/dpkg/glibc2.5-sync_file_range.patch
rename to poky/meta/recipes-devtools/dpkg/dpkg/glibc2.5-sync_file_range.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/dpkg/dpkg/noman.patch b/poky/meta/recipes-devtools/dpkg/dpkg/noman.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/dpkg/dpkg/noman.patch
rename to poky/meta/recipes-devtools/dpkg/dpkg/noman.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch b/poky/meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch
rename to poky/meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/dpkg/dpkg_1.18.24.bb b/poky/meta/recipes-devtools/dpkg/dpkg_1.18.24.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/dpkg/dpkg_1.18.24.bb
rename to poky/meta/recipes-devtools/dpkg/dpkg_1.18.24.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/dwarfsrcfiles/dwarfsrcfiles.bb b/poky/meta/recipes-devtools/dwarfsrcfiles/dwarfsrcfiles.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/dwarfsrcfiles/dwarfsrcfiles.bb
rename to poky/meta/recipes-devtools/dwarfsrcfiles/dwarfsrcfiles.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/dwarfsrcfiles/files/dwarfsrcfiles.c b/poky/meta/recipes-devtools/dwarfsrcfiles/files/dwarfsrcfiles.c
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/dwarfsrcfiles/files/dwarfsrcfiles.c
rename to poky/meta/recipes-devtools/dwarfsrcfiles/files/dwarfsrcfiles.c
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc b/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
rename to poky/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-build-failure-in-swapfs.c-on-big-endia.patch b/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-build-failure-in-swapfs.c-on-big-endia.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-build-failure-in-swapfs.c-on-big-endia.patch
rename to poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-build-failure-in-swapfs.c-on-big-endia.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-misc-create_inode.c-set-dir-s-mode-correctly.patch b/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-misc-create_inode.c-set-dir-s-mode-correctly.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-misc-create_inode.c-set-dir-s-mode-correctly.patch
rename to poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-misc-create_inode.c-set-dir-s-mode-correctly.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch b/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch
rename to poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch b/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch
rename to poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-fix-missing-check-for-permission-denied.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdir_p.patch b/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdir_p.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdir_p.patch
rename to poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/mkdir_p.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch b/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch
rename to poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch b/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch
rename to poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/quiet-debugfs.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/remove.ldconfig.call.patch b/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/remove.ldconfig.call.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/remove.ldconfig.call.patch
rename to poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/remove.ldconfig.call.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest b/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest
rename to poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb b/poky/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb
rename to poky/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.8.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/elfutils/elfutils_0.170.bb b/poky/meta/recipes-devtools/elfutils/elfutils_0.170.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/elfutils/elfutils_0.170.bb
rename to poky/meta/recipes-devtools/elfutils/elfutils_0.170.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/elfutils/files/0001-Ensure-that-packed-structs-follow-the-gcc-memory-lay.patch b/poky/meta/recipes-devtools/elfutils/files/0001-Ensure-that-packed-structs-follow-the-gcc-memory-lay.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/elfutils/files/0001-Ensure-that-packed-structs-follow-the-gcc-memory-lay.patch
rename to poky/meta/recipes-devtools/elfutils/files/0001-Ensure-that-packed-structs-follow-the-gcc-memory-lay.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/elfutils/files/0001-Use-fallthrough-attribute.patch b/poky/meta/recipes-devtools/elfutils/files/0001-Use-fallthrough-attribute.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/elfutils/files/0001-Use-fallthrough-attribute.patch
rename to poky/meta/recipes-devtools/elfutils/files/0001-Use-fallthrough-attribute.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch b/poky/meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch
rename to poky/meta/recipes-devtools/elfutils/files/0001-dso-link-change.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch b/poky/meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch
rename to poky/meta/recipes-devtools/elfutils/files/0001-libasm-may-link-with-libbz2-if-found.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/elfutils/files/0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch b/poky/meta/recipes-devtools/elfutils/files/0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/elfutils/files/0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch
rename to poky/meta/recipes-devtools/elfutils/files/0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/elfutils/files/0003-fixheadercheck.patch b/poky/meta/recipes-devtools/elfutils/files/0003-fixheadercheck.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/elfutils/files/0003-fixheadercheck.patch
rename to poky/meta/recipes-devtools/elfutils/files/0003-fixheadercheck.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/elfutils/files/0004-Disable-the-test-to-convert-euc-jp.patch b/poky/meta/recipes-devtools/elfutils/files/0004-Disable-the-test-to-convert-euc-jp.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/elfutils/files/0004-Disable-the-test-to-convert-euc-jp.patch
rename to poky/meta/recipes-devtools/elfutils/files/0004-Disable-the-test-to-convert-euc-jp.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/elfutils/files/0005-fix-a-stack-usage-warning.patch b/poky/meta/recipes-devtools/elfutils/files/0005-fix-a-stack-usage-warning.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/elfutils/files/0005-fix-a-stack-usage-warning.patch
rename to poky/meta/recipes-devtools/elfutils/files/0005-fix-a-stack-usage-warning.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch b/poky/meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch
rename to poky/meta/recipes-devtools/elfutils/files/0006-Fix-build-on-aarch64-musl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/elfutils/files/0007-Fix-control-path-where-we-have-str-as-uninitialized-.patch b/poky/meta/recipes-devtools/elfutils/files/0007-Fix-control-path-where-we-have-str-as-uninitialized-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/elfutils/files/0007-Fix-control-path-where-we-have-str-as-uninitialized-.patch
rename to poky/meta/recipes-devtools/elfutils/files/0007-Fix-control-path-where-we-have-str-as-uninitialized-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/elfutils/files/0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch b/poky/meta/recipes-devtools/elfutils/files/0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/elfutils/files/0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch
rename to poky/meta/recipes-devtools/elfutils/files/0008-build-Provide-alternatives-for-glibc-assumptions-hel.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/elfutils/files/debian/0001-Ignore-differences-between-mips-machine-identifiers.patch b/poky/meta/recipes-devtools/elfutils/files/debian/0001-Ignore-differences-between-mips-machine-identifiers.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/elfutils/files/debian/0001-Ignore-differences-between-mips-machine-identifiers.patch
rename to poky/meta/recipes-devtools/elfutils/files/debian/0001-Ignore-differences-between-mips-machine-identifiers.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/elfutils/files/debian/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch b/poky/meta/recipes-devtools/elfutils/files/debian/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/elfutils/files/debian/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch
rename to poky/meta/recipes-devtools/elfutils/files/debian/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/elfutils/files/debian/0003-Add-mips-n64-relocation-format-hack.patch b/poky/meta/recipes-devtools/elfutils/files/debian/0003-Add-mips-n64-relocation-format-hack.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/elfutils/files/debian/0003-Add-mips-n64-relocation-format-hack.patch
rename to poky/meta/recipes-devtools/elfutils/files/debian/0003-Add-mips-n64-relocation-format-hack.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/elfutils/files/debian/arm_backend.diff b/poky/meta/recipes-devtools/elfutils/files/debian/arm_backend.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/elfutils/files/debian/arm_backend.diff
rename to poky/meta/recipes-devtools/elfutils/files/debian/arm_backend.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/elfutils/files/debian/hppa_backend.diff b/poky/meta/recipes-devtools/elfutils/files/debian/hppa_backend.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/elfutils/files/debian/hppa_backend.diff
rename to poky/meta/recipes-devtools/elfutils/files/debian/hppa_backend.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/elfutils/files/debian/mips_backend.patch b/poky/meta/recipes-devtools/elfutils/files/debian/mips_backend.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/elfutils/files/debian/mips_backend.patch
rename to poky/meta/recipes-devtools/elfutils/files/debian/mips_backend.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/elfutils/files/debian/mips_readelf_w.patch b/poky/meta/recipes-devtools/elfutils/files/debian/mips_readelf_w.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/elfutils/files/debian/mips_readelf_w.patch
rename to poky/meta/recipes-devtools/elfutils/files/debian/mips_readelf_w.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/expect/expect/0001-Resolve-string-formatting-issues.patch b/poky/meta/recipes-devtools/expect/expect/0001-Resolve-string-formatting-issues.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/expect/expect/0001-Resolve-string-formatting-issues.patch
rename to poky/meta/recipes-devtools/expect/expect/0001-Resolve-string-formatting-issues.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/expect/expect/0001-configure.in.patch b/poky/meta/recipes-devtools/expect/expect/0001-configure.in.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/expect/expect/0001-configure.in.patch
rename to poky/meta/recipes-devtools/expect/expect/0001-configure.in.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/expect/expect/0001-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch b/poky/meta/recipes-devtools/expect/expect/0001-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/expect/expect/0001-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch
rename to poky/meta/recipes-devtools/expect/expect/0001-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/expect/expect/0001-expect-install-scripts-without-using-the-fixline1-tc.patch b/poky/meta/recipes-devtools/expect/expect/0001-expect-install-scripts-without-using-the-fixline1-tc.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/expect/expect/0001-expect-install-scripts-without-using-the-fixline1-tc.patch
rename to poky/meta/recipes-devtools/expect/expect/0001-expect-install-scripts-without-using-the-fixline1-tc.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/expect/expect/0002-tcl.m4.patch b/poky/meta/recipes-devtools/expect/expect/0002-tcl.m4.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/expect/expect/0002-tcl.m4.patch
rename to poky/meta/recipes-devtools/expect/expect/0002-tcl.m4.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/expect/expect/01-example-shebang.patch b/poky/meta/recipes-devtools/expect/expect/01-example-shebang.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/expect/expect/01-example-shebang.patch
rename to poky/meta/recipes-devtools/expect/expect/01-example-shebang.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/expect/expect_5.45.4.bb b/poky/meta/recipes-devtools/expect/expect_5.45.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/expect/expect_5.45.4.bb
rename to poky/meta/recipes-devtools/expect/expect_5.45.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/fdisk/gptfdisk_1.0.3.bb b/poky/meta/recipes-devtools/fdisk/gptfdisk_1.0.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/fdisk/gptfdisk_1.0.3.bb
rename to poky/meta/recipes-devtools/fdisk/gptfdisk_1.0.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/file/file/0001-Add-P-prompt-into-Usage-info.patch b/poky/meta/recipes-devtools/file/file/0001-Add-P-prompt-into-Usage-info.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/file/file/0001-Add-P-prompt-into-Usage-info.patch
rename to poky/meta/recipes-devtools/file/file/0001-Add-P-prompt-into-Usage-info.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/file/file/debian-742262.patch b/poky/meta/recipes-devtools/file/file/debian-742262.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/file/file/debian-742262.patch
rename to poky/meta/recipes-devtools/file/file/debian-742262.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/file/file_5.32.bb b/poky/meta/recipes-devtools/file/file_5.32.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/file/file_5.32.bb
rename to poky/meta/recipes-devtools/file/file_5.32.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/flex/flex/0001-tests-add-a-target-for-building-tests-without-runnin.patch b/poky/meta/recipes-devtools/flex/flex/0001-tests-add-a-target-for-building-tests-without-runnin.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/flex/flex/0001-tests-add-a-target-for-building-tests-without-runnin.patch
rename to poky/meta/recipes-devtools/flex/flex/0001-tests-add-a-target-for-building-tests-without-runnin.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/flex/flex/0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch b/poky/meta/recipes-devtools/flex/flex/0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/flex/flex/0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch
rename to poky/meta/recipes-devtools/flex/flex/0002-avoid-c-comments-in-c-code-fails-with-gcc-6.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/flex/flex/CVE-2016-6354.patch b/poky/meta/recipes-devtools/flex/flex/CVE-2016-6354.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/flex/flex/CVE-2016-6354.patch
rename to poky/meta/recipes-devtools/flex/flex/CVE-2016-6354.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/flex/flex/disable-tests.patch b/poky/meta/recipes-devtools/flex/flex/disable-tests.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/flex/flex/disable-tests.patch
rename to poky/meta/recipes-devtools/flex/flex/disable-tests.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/flex/flex/do_not_create_pdf_doc.patch b/poky/meta/recipes-devtools/flex/flex/do_not_create_pdf_doc.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/flex/flex/do_not_create_pdf_doc.patch
rename to poky/meta/recipes-devtools/flex/flex/do_not_create_pdf_doc.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/flex/flex/run-ptest b/poky/meta/recipes-devtools/flex/flex/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/flex/flex/run-ptest
rename to poky/meta/recipes-devtools/flex/flex/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/flex/flex_2.6.0.bb b/poky/meta/recipes-devtools/flex/flex_2.6.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/flex/flex_2.6.0.bb
rename to poky/meta/recipes-devtools/flex/flex_2.6.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3.inc b/poky/meta/recipes-devtools/gcc/gcc-7.3.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3.inc
rename to poky/meta/recipes-devtools/gcc/gcc-7.3.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0001-Fix-internal-compiler-error-in-testcase.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0001-Fix-internal-compiler-error-in-testcase.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0001-Fix-internal-compiler-error-in-testcase.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0001-Fix-internal-compiler-error-in-testcase.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0001-Fix-ppc64le-build-Partial-backport-r256656.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0001-Fix-ppc64le-build-Partial-backport-r256656.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0001-Fix-ppc64le-build-Partial-backport-r256656.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0001-Fix-ppc64le-build-Partial-backport-r256656.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0001-PR-c-80290-memory-hog-with-std-pair.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0001-PR-c-80290-memory-hog-with-std-pair.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0001-PR-c-80290-memory-hog-with-std-pair.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0001-PR-c-80290-memory-hog-with-std-pair.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0001-PR-rtl-optimization-83030.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0001-PR-rtl-optimization-83030.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0001-PR-rtl-optimization-83030.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0001-PR-rtl-optimization-83030.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0008-c99-snprintf.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0008-c99-snprintf.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0008-c99-snprintf.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0008-c99-snprintf.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0009-gcc-poison-system-directories.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0009-gcc-poison-system-directories.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0009-gcc-poison-system-directories.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0009-gcc-poison-system-directories.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0010-gcc-poison-dir-extend.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0010-gcc-poison-dir-extend.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0010-gcc-poison-dir-extend.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0010-gcc-poison-dir-extend.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0011-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0011-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0011-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0011-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0012-64-bit-multilib-hack.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0012-64-bit-multilib-hack.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0012-64-bit-multilib-hack.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0012-64-bit-multilib-hack.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0013-optional-libstdc.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0013-optional-libstdc.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0013-optional-libstdc.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0013-optional-libstdc.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0014-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0014-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0014-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0014-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0015-COLLECT_GCC_OPTIONS.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0015-COLLECT_GCC_OPTIONS.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0015-COLLECT_GCC_OPTIONS.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0015-COLLECT_GCC_OPTIONS.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0016-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0016-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0016-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0016-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0017-fortran-cross-compile-hack.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0017-fortran-cross-compile-hack.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0017-fortran-cross-compile-hack.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0017-fortran-cross-compile-hack.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0018-cpp-honor-sysroot.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0018-cpp-honor-sysroot.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0018-cpp-honor-sysroot.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0018-cpp-honor-sysroot.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0019-MIPS64-Default-to-N64-ABI.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0019-MIPS64-Default-to-N64-ABI.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0019-MIPS64-Default-to-N64-ABI.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0019-MIPS64-Default-to-N64-ABI.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0020-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0020-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0020-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0020-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0021-gcc-Fix-argument-list-too-long-error.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0021-gcc-Fix-argument-list-too-long-error.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0021-gcc-Fix-argument-list-too-long-error.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0021-gcc-Fix-argument-list-too-long-error.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0022-Disable-sdt.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0022-Disable-sdt.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0022-Disable-sdt.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0022-Disable-sdt.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0023-libtool.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0023-libtool.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0023-libtool.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0023-libtool.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0024-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0024-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0024-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0024-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0025-Use-the-multilib-config-files-from-B-instead-of-usin.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0025-Use-the-multilib-config-files-from-B-instead-of-usin.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0025-Use-the-multilib-config-files-from-B-instead-of-usin.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0025-Use-the-multilib-config-files-from-B-instead-of-usin.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0026-Avoid-using-libdir-from-.la-which-usually-points-to-.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0026-Avoid-using-libdir-from-.la-which-usually-points-to-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0026-Avoid-using-libdir-from-.la-which-usually-points-to-.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0026-Avoid-using-libdir-from-.la-which-usually-points-to-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0027-export-CPP.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0027-export-CPP.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0027-export-CPP.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0027-export-CPP.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0028-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0028-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0028-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0028-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0029-Disable-the-MULTILIB_OSDIRNAMES-and-other-multilib-o.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0029-Disable-the-MULTILIB_OSDIRNAMES-and-other-multilib-o.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0029-Disable-the-MULTILIB_OSDIRNAMES-and-other-multilib-o.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0029-Disable-the-MULTILIB_OSDIRNAMES-and-other-multilib-o.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0030-Ensure-target-gcc-headers-can-be-included.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0030-Ensure-target-gcc-headers-can-be-included.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0030-Ensure-target-gcc-headers-can-be-included.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0030-Ensure-target-gcc-headers-can-be-included.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0031-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0031-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0031-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0031-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0032-Don-t-search-host-directory-during-relink-if-inst_pr.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0032-Don-t-search-host-directory-during-relink-if-inst_pr.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0032-Don-t-search-host-directory-during-relink-if-inst_pr.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0032-Don-t-search-host-directory-during-relink-if-inst_pr.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0033-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0033-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0033-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0033-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0034-aarch64-Add-support-for-musl-ldso.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0034-aarch64-Add-support-for-musl-ldso.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0034-aarch64-Add-support-for-musl-ldso.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0034-aarch64-Add-support-for-musl-ldso.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0035-libcc1-fix-libcc1-s-install-path-and-rpath.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0035-libcc1-fix-libcc1-s-install-path-and-rpath.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0035-libcc1-fix-libcc1-s-install-path-and-rpath.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0035-libcc1-fix-libcc1-s-install-path-and-rpath.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0036-handle-sysroot-support-for-nativesdk-gcc.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0036-handle-sysroot-support-for-nativesdk-gcc.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0036-handle-sysroot-support-for-nativesdk-gcc.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0036-handle-sysroot-support-for-nativesdk-gcc.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0037-Search-target-sysroot-gcc-version-specific-dirs-with.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0037-Search-target-sysroot-gcc-version-specific-dirs-with.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0037-Search-target-sysroot-gcc-version-specific-dirs-with.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0037-Search-target-sysroot-gcc-version-specific-dirs-with.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0038-Fix-various-_FOR_BUILD-and-related-variables.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0038-Fix-various-_FOR_BUILD-and-related-variables.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0038-Fix-various-_FOR_BUILD-and-related-variables.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0038-Fix-various-_FOR_BUILD-and-related-variables.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0039-nios2-Define-MUSL_DYNAMIC_LINKER.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0039-nios2-Define-MUSL_DYNAMIC_LINKER.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0039-nios2-Define-MUSL_DYNAMIC_LINKER.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0039-nios2-Define-MUSL_DYNAMIC_LINKER.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0040-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0040-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0040-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0040-Add-ssp_nonshared-to-link-commandline-for-musl-targe.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0041-gcc-libcpp-support-ffile-prefix-map-old-new.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0041-gcc-libcpp-support-ffile-prefix-map-old-new.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0041-gcc-libcpp-support-ffile-prefix-map-old-new.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0041-gcc-libcpp-support-ffile-prefix-map-old-new.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0042-Reuse-fdebug-prefix-map-to-replace-ffile-prefix-map.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0042-Reuse-fdebug-prefix-map-to-replace-ffile-prefix-map.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0042-Reuse-fdebug-prefix-map-to-replace-ffile-prefix-map.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0042-Reuse-fdebug-prefix-map-to-replace-ffile-prefix-map.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0043-gcc-final.c-fdebug-prefix-map-support-to-remap-sourc.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0043-gcc-final.c-fdebug-prefix-map-support-to-remap-sourc.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0043-gcc-final.c-fdebug-prefix-map-support-to-remap-sourc.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0043-gcc-final.c-fdebug-prefix-map-support-to-remap-sourc.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0044-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0044-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0044-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0044-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0045-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0045-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0045-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0045-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0047-sync-gcc-stddef.h-with-musl.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0047-sync-gcc-stddef.h-with-musl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0047-sync-gcc-stddef.h-with-musl.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0047-sync-gcc-stddef.h-with-musl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0048-gcc-Enable-static-PIE.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/0048-gcc-Enable-static-PIE.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/0048-gcc-Enable-static-PIE.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/0048-gcc-Enable-static-PIE.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/fix-segmentation-fault-precompiled-hdr.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/fix-segmentation-fault-precompiled-hdr.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/fix-segmentation-fault-precompiled-hdr.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/fix-segmentation-fault-precompiled-hdr.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/no-sse-fix-test-case-failures.patch b/poky/meta/recipes-devtools/gcc/gcc-7.3/no-sse-fix-test-case-failures.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-7.3/no-sse-fix-test-case-failures.patch
rename to poky/meta/recipes-devtools/gcc/gcc-7.3/no-sse-fix-test-case-failures.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-common.inc b/poky/meta/recipes-devtools/gcc/gcc-common.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-common.inc
rename to poky/meta/recipes-devtools/gcc/gcc-common.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-configure-common.inc b/poky/meta/recipes-devtools/gcc/gcc-configure-common.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-configure-common.inc
rename to poky/meta/recipes-devtools/gcc/gcc-configure-common.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/poky/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
rename to poky/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-cross-canadian_7.3.bb b/poky/meta/recipes-devtools/gcc/gcc-cross-canadian_7.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-cross-canadian_7.3.bb
rename to poky/meta/recipes-devtools/gcc/gcc-cross-canadian_7.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-cross-initial.inc b/poky/meta/recipes-devtools/gcc/gcc-cross-initial.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-cross-initial.inc
rename to poky/meta/recipes-devtools/gcc/gcc-cross-initial.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-cross-initial_7.3.bb b/poky/meta/recipes-devtools/gcc/gcc-cross-initial_7.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-cross-initial_7.3.bb
rename to poky/meta/recipes-devtools/gcc/gcc-cross-initial_7.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-cross.inc b/poky/meta/recipes-devtools/gcc/gcc-cross.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-cross.inc
rename to poky/meta/recipes-devtools/gcc/gcc-cross.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-cross_7.3.bb b/poky/meta/recipes-devtools/gcc/gcc-cross_7.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-cross_7.3.bb
rename to poky/meta/recipes-devtools/gcc/gcc-cross_7.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-crosssdk-initial.inc b/poky/meta/recipes-devtools/gcc/gcc-crosssdk-initial.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-crosssdk-initial.inc
rename to poky/meta/recipes-devtools/gcc/gcc-crosssdk-initial.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-crosssdk-initial_7.3.bb b/poky/meta/recipes-devtools/gcc/gcc-crosssdk-initial_7.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-crosssdk-initial_7.3.bb
rename to poky/meta/recipes-devtools/gcc/gcc-crosssdk-initial_7.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-crosssdk.inc b/poky/meta/recipes-devtools/gcc/gcc-crosssdk.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-crosssdk.inc
rename to poky/meta/recipes-devtools/gcc/gcc-crosssdk.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-crosssdk_7.3.bb b/poky/meta/recipes-devtools/gcc/gcc-crosssdk_7.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-crosssdk_7.3.bb
rename to poky/meta/recipes-devtools/gcc/gcc-crosssdk_7.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-multilib-config.inc b/poky/meta/recipes-devtools/gcc/gcc-multilib-config.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-multilib-config.inc
rename to poky/meta/recipes-devtools/gcc/gcc-multilib-config.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-runtime.inc b/poky/meta/recipes-devtools/gcc/gcc-runtime.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-runtime.inc
rename to poky/meta/recipes-devtools/gcc/gcc-runtime.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-runtime_7.3.bb b/poky/meta/recipes-devtools/gcc/gcc-runtime_7.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-runtime_7.3.bb
rename to poky/meta/recipes-devtools/gcc/gcc-runtime_7.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-sanitizers.inc b/poky/meta/recipes-devtools/gcc/gcc-sanitizers.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-sanitizers.inc
rename to poky/meta/recipes-devtools/gcc/gcc-sanitizers.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-sanitizers_7.3.bb b/poky/meta/recipes-devtools/gcc/gcc-sanitizers_7.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-sanitizers_7.3.bb
rename to poky/meta/recipes-devtools/gcc/gcc-sanitizers_7.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-shared-source.inc b/poky/meta/recipes-devtools/gcc/gcc-shared-source.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-shared-source.inc
rename to poky/meta/recipes-devtools/gcc/gcc-shared-source.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-source.inc b/poky/meta/recipes-devtools/gcc/gcc-source.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-source.inc
rename to poky/meta/recipes-devtools/gcc/gcc-source.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-source_7.3.bb b/poky/meta/recipes-devtools/gcc/gcc-source_7.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-source_7.3.bb
rename to poky/meta/recipes-devtools/gcc/gcc-source_7.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-target.inc b/poky/meta/recipes-devtools/gcc/gcc-target.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc-target.inc
rename to poky/meta/recipes-devtools/gcc/gcc-target.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc_7.3.bb b/poky/meta/recipes-devtools/gcc/gcc_7.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/gcc_7.3.bb
rename to poky/meta/recipes-devtools/gcc/gcc_7.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/libgcc-common.inc b/poky/meta/recipes-devtools/gcc/libgcc-common.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/libgcc-common.inc
rename to poky/meta/recipes-devtools/gcc/libgcc-common.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/libgcc-initial.inc b/poky/meta/recipes-devtools/gcc/libgcc-initial.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/libgcc-initial.inc
rename to poky/meta/recipes-devtools/gcc/libgcc-initial.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/libgcc-initial_7.3.bb b/poky/meta/recipes-devtools/gcc/libgcc-initial_7.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/libgcc-initial_7.3.bb
rename to poky/meta/recipes-devtools/gcc/libgcc-initial_7.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/libgcc.inc b/poky/meta/recipes-devtools/gcc/libgcc.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/libgcc.inc
rename to poky/meta/recipes-devtools/gcc/libgcc.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/libgcc_7.3.bb b/poky/meta/recipes-devtools/gcc/libgcc_7.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/libgcc_7.3.bb
rename to poky/meta/recipes-devtools/gcc/libgcc_7.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/libgfortran.inc b/poky/meta/recipes-devtools/gcc/libgfortran.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/libgfortran.inc
rename to poky/meta/recipes-devtools/gcc/libgfortran.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gcc/libgfortran_7.3.bb b/poky/meta/recipes-devtools/gcc/libgfortran_7.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gcc/libgfortran_7.3.bb
rename to poky/meta/recipes-devtools/gcc/libgfortran_7.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb-8.0.1.inc b/poky/meta/recipes-devtools/gdb/gdb-8.0.1.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb-8.0.1.inc
rename to poky/meta/recipes-devtools/gdb/gdb-8.0.1.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb-common.inc b/poky/meta/recipes-devtools/gdb/gdb-common.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb-common.inc
rename to poky/meta/recipes-devtools/gdb/gdb-common.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb-cross-canadian.inc b/poky/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
rename to poky/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb-cross-canadian_8.0.1.bb b/poky/meta/recipes-devtools/gdb/gdb-cross-canadian_8.0.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb-cross-canadian_8.0.1.bb
rename to poky/meta/recipes-devtools/gdb/gdb-cross-canadian_8.0.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb-cross.inc b/poky/meta/recipes-devtools/gdb/gdb-cross.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb-cross.inc
rename to poky/meta/recipes-devtools/gdb/gdb-cross.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb-cross_8.0.1.bb b/poky/meta/recipes-devtools/gdb/gdb-cross_8.0.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb-cross_8.0.1.bb
rename to poky/meta/recipes-devtools/gdb/gdb-cross_8.0.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb.inc b/poky/meta/recipes-devtools/gdb/gdb.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb.inc
rename to poky/meta/recipes-devtools/gdb/gdb.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb/0001-include-sys-types.h-for-mode_t.patch b/poky/meta/recipes-devtools/gdb/gdb/0001-include-sys-types.h-for-mode_t.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb/0001-include-sys-types.h-for-mode_t.patch
rename to poky/meta/recipes-devtools/gdb/gdb/0001-include-sys-types.h-for-mode_t.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch b/poky/meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch
rename to poky/meta/recipes-devtools/gdb/gdb/0002-make-man-install-relative-to-DESTDIR.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch b/poky/meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch
rename to poky/meta/recipes-devtools/gdb/gdb/0003-mips-linux-nat-Define-_ABIO32-if-not-defined.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/poky/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch
rename to poky/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch b/poky/meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch
rename to poky/meta/recipes-devtools/gdb/gdb/0005-Add-support-for-Renesas-SH-sh4-architecture.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch b/poky/meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch
rename to poky/meta/recipes-devtools/gdb/gdb/0006-Dont-disable-libreadline.a-when-using-disable-static.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch b/poky/meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch
rename to poky/meta/recipes-devtools/gdb/gdb/0007-use-asm-sgidefs.h.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch b/poky/meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch
rename to poky/meta/recipes-devtools/gdb/gdb/0008-Use-exorted-definitions-of-SIGRTMIN.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch b/poky/meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch
rename to poky/meta/recipes-devtools/gdb/gdb/0009-Change-order-of-CFLAGS.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch b/poky/meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch
rename to poky/meta/recipes-devtools/gdb/gdb/0010-resolve-restrict-keyword-conflict.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb/0012-Unbreak-GDBserver-build-for-x32.patch b/poky/meta/recipes-devtools/gdb/gdb/0012-Unbreak-GDBserver-build-for-x32.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb/0012-Unbreak-GDBserver-build-for-x32.patch
rename to poky/meta/recipes-devtools/gdb/gdb/0012-Unbreak-GDBserver-build-for-x32.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb/gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-g.patch b/poky/meta/recipes-devtools/gdb/gdb/gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-g.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb/gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-g.patch
rename to poky/meta/recipes-devtools/gdb/gdb/gdb-Fix-ia64-defining-TRAP_HWBKPT-before-including-g.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb/package_devel_gdb_patches_120-sigprocmask-invalid-call.patch b/poky/meta/recipes-devtools/gdb/gdb/package_devel_gdb_patches_120-sigprocmask-invalid-call.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb/package_devel_gdb_patches_120-sigprocmask-invalid-call.patch
rename to poky/meta/recipes-devtools/gdb/gdb/package_devel_gdb_patches_120-sigprocmask-invalid-call.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb_8.0.1.bb b/poky/meta/recipes-devtools/gdb/gdb_8.0.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gdb/gdb_8.0.1.bb
rename to poky/meta/recipes-devtools/gdb/gdb_8.0.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/git/git.inc b/poky/meta/recipes-devtools/git/git.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/git/git.inc
rename to poky/meta/recipes-devtools/git/git.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/git/git_2.16.1.bb b/poky/meta/recipes-devtools/git/git_2.16.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/git/git_2.16.1.bb
rename to poky/meta/recipes-devtools/git/git_2.16.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/glide/glide_0.13.1.bb b/poky/meta/recipes-devtools/glide/glide_0.13.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/glide/glide_0.13.1.bb
rename to poky/meta/recipes-devtools/glide/glide_0.13.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gnu-config/gnu-config/gnu-configize.in b/poky/meta/recipes-devtools/gnu-config/gnu-config/gnu-configize.in
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gnu-config/gnu-config/gnu-configize.in
rename to poky/meta/recipes-devtools/gnu-config/gnu-config/gnu-configize.in
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gnu-config/gnu-config/musl-support.patch b/poky/meta/recipes-devtools/gnu-config/gnu-config/musl-support.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gnu-config/gnu-config/musl-support.patch
rename to poky/meta/recipes-devtools/gnu-config/gnu-config/musl-support.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gnu-config/gnu-config_20120814.bb b/poky/meta/recipes-devtools/gnu-config/gnu-config_20120814.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gnu-config/gnu-config_20120814.bb
rename to poky/meta/recipes-devtools/gnu-config/gnu-config_20120814.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/gnu-config/gnu-config_git.bb b/poky/meta/recipes-devtools/gnu-config/gnu-config_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/gnu-config/gnu-config_git.bb
rename to poky/meta/recipes-devtools/gnu-config/gnu-config_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-1.10.inc b/poky/meta/recipes-devtools/go/go-1.10.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-1.10.inc
rename to poky/meta/recipes-devtools/go/go-1.10.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-1.10/0001-allow-CC-and-CXX-to-have-multiple-words.patch b/poky/meta/recipes-devtools/go/go-1.10/0001-allow-CC-and-CXX-to-have-multiple-words.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-1.10/0001-allow-CC-and-CXX-to-have-multiple-words.patch
rename to poky/meta/recipes-devtools/go/go-1.10/0001-allow-CC-and-CXX-to-have-multiple-words.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-1.10/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch b/poky/meta/recipes-devtools/go/go-1.10/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-1.10/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch
rename to poky/meta/recipes-devtools/go/go-1.10/0002-cmd-go-make-content-based-hash-generation-less-pedan.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-1.10/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch b/poky/meta/recipes-devtools/go/go-1.10/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-1.10/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch
rename to poky/meta/recipes-devtools/go/go-1.10/0003-allow-GOTOOLDIR-to-be-overridden-in-the-environment.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-1.10/0004-ld-add-soname-to-shareable-objects.patch b/poky/meta/recipes-devtools/go/go-1.10/0004-ld-add-soname-to-shareable-objects.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-1.10/0004-ld-add-soname-to-shareable-objects.patch
rename to poky/meta/recipes-devtools/go/go-1.10/0004-ld-add-soname-to-shareable-objects.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-1.10/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch b/poky/meta/recipes-devtools/go/go-1.10/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-1.10/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch
rename to poky/meta/recipes-devtools/go/go-1.10/0005-make.bash-override-CC-when-building-dist-and-go_boot.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-1.10/0006-cmd-dist-separate-host-and-target-builds.patch b/poky/meta/recipes-devtools/go/go-1.10/0006-cmd-dist-separate-host-and-target-builds.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-1.10/0006-cmd-dist-separate-host-and-target-builds.patch
rename to poky/meta/recipes-devtools/go/go-1.10/0006-cmd-dist-separate-host-and-target-builds.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-1.10/0007-cmd-go-make-GOROOT-precious-by-default.patch b/poky/meta/recipes-devtools/go/go-1.10/0007-cmd-go-make-GOROOT-precious-by-default.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-1.10/0007-cmd-go-make-GOROOT-precious-by-default.patch
rename to poky/meta/recipes-devtools/go/go-1.10/0007-cmd-go-make-GOROOT-precious-by-default.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-1.10/0008-cmd-internal-obj-arm64-fix-branch-too-far-with-TBZ-l.patch b/poky/meta/recipes-devtools/go/go-1.10/0008-cmd-internal-obj-arm64-fix-branch-too-far-with-TBZ-l.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-1.10/0008-cmd-internal-obj-arm64-fix-branch-too-far-with-TBZ-l.patch
rename to poky/meta/recipes-devtools/go/go-1.10/0008-cmd-internal-obj-arm64-fix-branch-too-far-with-TBZ-l.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-1.10/0009-ld-replace-glibc-dynamic-linker-with-musl.patch b/poky/meta/recipes-devtools/go/go-1.10/0009-ld-replace-glibc-dynamic-linker-with-musl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-1.10/0009-ld-replace-glibc-dynamic-linker-with-musl.patch
rename to poky/meta/recipes-devtools/go/go-1.10/0009-ld-replace-glibc-dynamic-linker-with-musl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-1.9.inc b/poky/meta/recipes-devtools/go/go-1.9.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-1.9.inc
rename to poky/meta/recipes-devtools/go/go-1.9.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-1.9/0001-make.bash-quote-CC_FOR_TARGET.patch b/poky/meta/recipes-devtools/go/go-1.9/0001-make.bash-quote-CC_FOR_TARGET.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-1.9/0001-make.bash-quote-CC_FOR_TARGET.patch
rename to poky/meta/recipes-devtools/go/go-1.9/0001-make.bash-quote-CC_FOR_TARGET.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-1.9/0002-cmd-go-fix-CC-and-CXX-environment-variable-construct.patch b/poky/meta/recipes-devtools/go/go-1.9/0002-cmd-go-fix-CC-and-CXX-environment-variable-construct.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-1.9/0002-cmd-go-fix-CC-and-CXX-environment-variable-construct.patch
rename to poky/meta/recipes-devtools/go/go-1.9/0002-cmd-go-fix-CC-and-CXX-environment-variable-construct.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-1.9/0003-make.bash-better-separate-host-and-target-builds.patch b/poky/meta/recipes-devtools/go/go-1.9/0003-make.bash-better-separate-host-and-target-builds.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-1.9/0003-make.bash-better-separate-host-and-target-builds.patch
rename to poky/meta/recipes-devtools/go/go-1.9/0003-make.bash-better-separate-host-and-target-builds.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-1.9/0004-cmd-go-allow-GOTOOLDIR-to-be-overridden-in-the-envir.patch b/poky/meta/recipes-devtools/go/go-1.9/0004-cmd-go-allow-GOTOOLDIR-to-be-overridden-in-the-envir.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-1.9/0004-cmd-go-allow-GOTOOLDIR-to-be-overridden-in-the-envir.patch
rename to poky/meta/recipes-devtools/go/go-1.9/0004-cmd-go-allow-GOTOOLDIR-to-be-overridden-in-the-envir.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-1.9/0005-cmd-go-make-GOROOT-precious-by-default.patch b/poky/meta/recipes-devtools/go/go-1.9/0005-cmd-go-make-GOROOT-precious-by-default.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-1.9/0005-cmd-go-make-GOROOT-precious-by-default.patch
rename to poky/meta/recipes-devtools/go/go-1.9/0005-cmd-go-make-GOROOT-precious-by-default.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-1.9/0006-make.bash-add-GOTOOLDIR_BOOTSTRAP-environment-variab.patch b/poky/meta/recipes-devtools/go/go-1.9/0006-make.bash-add-GOTOOLDIR_BOOTSTRAP-environment-variab.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-1.9/0006-make.bash-add-GOTOOLDIR_BOOTSTRAP-environment-variab.patch
rename to poky/meta/recipes-devtools/go/go-1.9/0006-make.bash-add-GOTOOLDIR_BOOTSTRAP-environment-variab.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-1.9/0007-ld-add-soname-to-shareable-objects.patch b/poky/meta/recipes-devtools/go/go-1.9/0007-ld-add-soname-to-shareable-objects.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-1.9/0007-ld-add-soname-to-shareable-objects.patch
rename to poky/meta/recipes-devtools/go/go-1.9/0007-ld-add-soname-to-shareable-objects.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-1.9/0008-make.bash-add-GOHOSTxx-indirection-for-cross-canadia.patch b/poky/meta/recipes-devtools/go/go-1.9/0008-make.bash-add-GOHOSTxx-indirection-for-cross-canadia.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-1.9/0008-make.bash-add-GOHOSTxx-indirection-for-cross-canadia.patch
rename to poky/meta/recipes-devtools/go/go-1.9/0008-make.bash-add-GOHOSTxx-indirection-for-cross-canadia.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-1.9/0009-cmd-go-buildmode-pie-forces-external-linking-mode-on.patch b/poky/meta/recipes-devtools/go/go-1.9/0009-cmd-go-buildmode-pie-forces-external-linking-mode-on.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-1.9/0009-cmd-go-buildmode-pie-forces-external-linking-mode-on.patch
rename to poky/meta/recipes-devtools/go/go-1.9/0009-cmd-go-buildmode-pie-forces-external-linking-mode-on.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-1.9/0010-make.bash-override-CC-when-building-dist-and-go_boot.patch b/poky/meta/recipes-devtools/go/go-1.9/0010-make.bash-override-CC-when-building-dist-and-go_boot.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-1.9/0010-make.bash-override-CC-when-building-dist-and-go_boot.patch
rename to poky/meta/recipes-devtools/go/go-1.9/0010-make.bash-override-CC-when-building-dist-and-go_boot.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-1.9/set-external-linker.patch b/poky/meta/recipes-devtools/go/go-1.9/set-external-linker.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-1.9/set-external-linker.patch
rename to poky/meta/recipes-devtools/go/go-1.9/set-external-linker.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-common.inc b/poky/meta/recipes-devtools/go/go-common.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-common.inc
rename to poky/meta/recipes-devtools/go/go-common.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-cross-canadian.inc b/poky/meta/recipes-devtools/go/go-cross-canadian.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-cross-canadian.inc
rename to poky/meta/recipes-devtools/go/go-cross-canadian.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-cross-canadian_1.10.bb b/poky/meta/recipes-devtools/go/go-cross-canadian_1.10.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-cross-canadian_1.10.bb
rename to poky/meta/recipes-devtools/go/go-cross-canadian_1.10.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-cross-canadian_1.9.bb b/poky/meta/recipes-devtools/go/go-cross-canadian_1.9.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-cross-canadian_1.9.bb
rename to poky/meta/recipes-devtools/go/go-cross-canadian_1.9.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-cross.inc b/poky/meta/recipes-devtools/go/go-cross.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-cross.inc
rename to poky/meta/recipes-devtools/go/go-cross.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-cross_1.10.bb b/poky/meta/recipes-devtools/go/go-cross_1.10.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-cross_1.10.bb
rename to poky/meta/recipes-devtools/go/go-cross_1.10.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-cross_1.9.bb b/poky/meta/recipes-devtools/go/go-cross_1.9.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-cross_1.9.bb
rename to poky/meta/recipes-devtools/go/go-cross_1.9.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-crosssdk.inc b/poky/meta/recipes-devtools/go/go-crosssdk.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-crosssdk.inc
rename to poky/meta/recipes-devtools/go/go-crosssdk.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-crosssdk_1.10.bb b/poky/meta/recipes-devtools/go/go-crosssdk_1.10.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-crosssdk_1.10.bb
rename to poky/meta/recipes-devtools/go/go-crosssdk_1.10.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-crosssdk_1.9.bb b/poky/meta/recipes-devtools/go/go-crosssdk_1.9.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-crosssdk_1.9.bb
rename to poky/meta/recipes-devtools/go/go-crosssdk_1.9.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-dep/0001-Add-support-for-mips-mips64.patch b/poky/meta/recipes-devtools/go/go-dep/0001-Add-support-for-mips-mips64.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-dep/0001-Add-support-for-mips-mips64.patch
rename to poky/meta/recipes-devtools/go/go-dep/0001-Add-support-for-mips-mips64.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-dep_0.4.1.bb b/poky/meta/recipes-devtools/go/go-dep_0.4.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-dep_0.4.1.bb
rename to poky/meta/recipes-devtools/go/go-dep_0.4.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-native.inc b/poky/meta/recipes-devtools/go/go-native.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-native.inc
rename to poky/meta/recipes-devtools/go/go-native.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-native_1.10.bb b/poky/meta/recipes-devtools/go/go-native_1.10.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-native_1.10.bb
rename to poky/meta/recipes-devtools/go/go-native_1.10.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-native_1.9.bb b/poky/meta/recipes-devtools/go/go-native_1.9.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-native_1.9.bb
rename to poky/meta/recipes-devtools/go/go-native_1.9.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-runtime.inc b/poky/meta/recipes-devtools/go/go-runtime.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-runtime.inc
rename to poky/meta/recipes-devtools/go/go-runtime.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-runtime_1.10.bb b/poky/meta/recipes-devtools/go/go-runtime_1.10.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-runtime_1.10.bb
rename to poky/meta/recipes-devtools/go/go-runtime_1.10.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-runtime_1.9.bb b/poky/meta/recipes-devtools/go/go-runtime_1.9.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-runtime_1.9.bb
rename to poky/meta/recipes-devtools/go/go-runtime_1.9.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go-target.inc b/poky/meta/recipes-devtools/go/go-target.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go-target.inc
rename to poky/meta/recipes-devtools/go/go-target.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go_1.10.bb b/poky/meta/recipes-devtools/go/go_1.10.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go_1.10.bb
rename to poky/meta/recipes-devtools/go/go_1.10.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/go/go_1.9.bb b/poky/meta/recipes-devtools/go/go_1.9.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/go/go_1.9.bb
rename to poky/meta/recipes-devtools/go/go_1.9.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/help2man/help2man-native_1.47.5.bb b/poky/meta/recipes-devtools/help2man/help2man-native_1.47.5.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/help2man/help2man-native_1.47.5.bb
rename to poky/meta/recipes-devtools/help2man/help2man-native_1.47.5.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/i2c-tools/files/0001-i2c-tools-eeprog-Module.mk-Add-missing-dependency.patch b/poky/meta/recipes-devtools/i2c-tools/files/0001-i2c-tools-eeprog-Module.mk-Add-missing-dependency.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/i2c-tools/files/0001-i2c-tools-eeprog-Module.mk-Add-missing-dependency.patch
rename to poky/meta/recipes-devtools/i2c-tools/files/0001-i2c-tools-eeprog-Module.mk-Add-missing-dependency.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/i2c-tools/files/0001-lib-Module.mk-Add-missing-dependencies.patch b/poky/meta/recipes-devtools/i2c-tools/files/0001-lib-Module.mk-Add-missing-dependencies.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/i2c-tools/files/0001-lib-Module.mk-Add-missing-dependencies.patch
rename to poky/meta/recipes-devtools/i2c-tools/files/0001-lib-Module.mk-Add-missing-dependencies.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/i2c-tools/files/0001-tools-Module.mk-Add-missing-dependencies.patch b/poky/meta/recipes-devtools/i2c-tools/files/0001-tools-Module.mk-Add-missing-dependencies.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/i2c-tools/files/0001-tools-Module.mk-Add-missing-dependencies.patch
rename to poky/meta/recipes-devtools/i2c-tools/files/0001-tools-Module.mk-Add-missing-dependencies.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/i2c-tools/files/remove-i2c-dev.patch b/poky/meta/recipes-devtools/i2c-tools/files/remove-i2c-dev.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/i2c-tools/files/remove-i2c-dev.patch
rename to poky/meta/recipes-devtools/i2c-tools/files/remove-i2c-dev.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/i2c-tools/i2c-tools_4.0.bb b/poky/meta/recipes-devtools/i2c-tools/i2c-tools_4.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/i2c-tools/i2c-tools_4.0.bb
rename to poky/meta/recipes-devtools/i2c-tools/i2c-tools_4.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env b/poky/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
rename to poky/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/icecc-create-env/icecc-create-env_0.1.bb b/poky/meta/recipes-devtools/icecc-create-env/icecc-create-env_0.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/icecc-create-env/icecc-create-env_0.1.bb
rename to poky/meta/recipes-devtools/icecc-create-env/icecc-create-env_0.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-env.sh b/poky/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-env.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-env.sh
rename to poky/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-env.sh
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-setup.sh b/poky/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-setup.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-setup.sh
rename to poky/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-setup.sh
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/icecc-toolchain/nativesdk-icecc-toolchain_0.1.bb b/poky/meta/recipes-devtools/icecc-toolchain/nativesdk-icecc-toolchain_0.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/icecc-toolchain/nativesdk-icecc-toolchain_0.1.bb
rename to poky/meta/recipes-devtools/icecc-toolchain/nativesdk-icecc-toolchain_0.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/icon-naming-utils/icon-naming-utils_0.8.90.bb b/poky/meta/recipes-devtools/icon-naming-utils/icon-naming-utils_0.8.90.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/icon-naming-utils/icon-naming-utils_0.8.90.bb
rename to poky/meta/recipes-devtools/icon-naming-utils/icon-naming-utils_0.8.90.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/intltool/intltool/intltool-nowarn.patch b/poky/meta/recipes-devtools/intltool/intltool/intltool-nowarn.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/intltool/intltool/intltool-nowarn.patch
rename to poky/meta/recipes-devtools/intltool/intltool/intltool-nowarn.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/intltool/intltool/noperlcheck.patch b/poky/meta/recipes-devtools/intltool/intltool/noperlcheck.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/intltool/intltool/noperlcheck.patch
rename to poky/meta/recipes-devtools/intltool/intltool/noperlcheck.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/intltool/intltool/perl-522-deprecations.patch b/poky/meta/recipes-devtools/intltool/intltool/perl-522-deprecations.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/intltool/intltool/perl-522-deprecations.patch
rename to poky/meta/recipes-devtools/intltool/intltool/perl-522-deprecations.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/intltool/intltool/remove-perl-check.patch b/poky/meta/recipes-devtools/intltool/intltool/remove-perl-check.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/intltool/intltool/remove-perl-check.patch
rename to poky/meta/recipes-devtools/intltool/intltool/remove-perl-check.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/intltool/intltool_0.51.0.bb b/poky/meta/recipes-devtools/intltool/intltool_0.51.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/intltool/intltool_0.51.0.bb
rename to poky/meta/recipes-devtools/intltool/intltool_0.51.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/json-c/json-c_0.13.bb b/poky/meta/recipes-devtools/json-c/json-c_0.13.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/json-c/json-c_0.13.bb
rename to poky/meta/recipes-devtools/json-c/json-c_0.13.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/libcomps/libcomps/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch b/poky/meta/recipes-devtools/libcomps/libcomps/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/libcomps/libcomps/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch
rename to poky/meta/recipes-devtools/libcomps/libcomps/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/libcomps/libcomps/0001-Make-__comps_objmrtree_all-static-inline.patch b/poky/meta/recipes-devtools/libcomps/libcomps/0001-Make-__comps_objmrtree_all-static-inline.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/libcomps/libcomps/0001-Make-__comps_objmrtree_all-static-inline.patch
rename to poky/meta/recipes-devtools/libcomps/libcomps/0001-Make-__comps_objmrtree_all-static-inline.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/libcomps/libcomps/0002-Set-library-installation-path-correctly.patch b/poky/meta/recipes-devtools/libcomps/libcomps/0002-Set-library-installation-path-correctly.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/libcomps/libcomps/0002-Set-library-installation-path-correctly.patch
rename to poky/meta/recipes-devtools/libcomps/libcomps/0002-Set-library-installation-path-correctly.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/libcomps/libcomps_git.bb b/poky/meta/recipes-devtools/libcomps/libcomps_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/libcomps/libcomps_git.bb
rename to poky/meta/recipes-devtools/libcomps/libcomps_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/libdnf/libdnf/0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch b/poky/meta/recipes-devtools/libdnf/libdnf/0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/libdnf/libdnf/0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch
rename to poky/meta/recipes-devtools/libdnf/libdnf/0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch b/poky/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch
rename to poky/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/libdnf/libdnf/0002-Prefix-sysroot-path-to-introspection-tools-path.patch b/poky/meta/recipes-devtools/libdnf/libdnf/0002-Prefix-sysroot-path-to-introspection-tools-path.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/libdnf/libdnf/0002-Prefix-sysroot-path-to-introspection-tools-path.patch
rename to poky/meta/recipes-devtools/libdnf/libdnf/0002-Prefix-sysroot-path-to-introspection-tools-path.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/libdnf/libdnf/0003-Set-the-library-installation-directory-correctly.patch b/poky/meta/recipes-devtools/libdnf/libdnf/0003-Set-the-library-installation-directory-correctly.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/libdnf/libdnf/0003-Set-the-library-installation-directory-correctly.patch
rename to poky/meta/recipes-devtools/libdnf/libdnf/0003-Set-the-library-installation-directory-correctly.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch b/poky/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch
rename to poky/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/libdnf/libdnf_0.11.1.bb b/poky/meta/recipes-devtools/libdnf/libdnf_0.11.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/libdnf/libdnf_0.11.1.bb
rename to poky/meta/recipes-devtools/libdnf/libdnf_0.11.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch b/poky/meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch
rename to poky/meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch b/poky/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch
rename to poky/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/librepo/librepo_1.8.1.bb b/poky/meta/recipes-devtools/librepo/librepo_1.8.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/librepo/librepo_1.8.1.bb
rename to poky/meta/recipes-devtools/librepo/librepo_1.8.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/libtool/libtool-2.4.6.inc b/poky/meta/recipes-devtools/libtool/libtool-2.4.6.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/libtool/libtool-2.4.6.inc
rename to poky/meta/recipes-devtools/libtool/libtool-2.4.6.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/libtool/libtool-cross_2.4.6.bb b/poky/meta/recipes-devtools/libtool/libtool-cross_2.4.6.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/libtool/libtool-cross_2.4.6.bb
rename to poky/meta/recipes-devtools/libtool/libtool-cross_2.4.6.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/libtool/libtool-native_2.4.6.bb b/poky/meta/recipes-devtools/libtool/libtool-native_2.4.6.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/libtool/libtool-native_2.4.6.bb
rename to poky/meta/recipes-devtools/libtool/libtool-native_2.4.6.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/libtool/libtool/0001-libtool-Fix-support-for-NIOS2-processor.patch b/poky/meta/recipes-devtools/libtool/libtool/0001-libtool-Fix-support-for-NIOS2-processor.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/libtool/libtool/0001-libtool-Fix-support-for-NIOS2-processor.patch
rename to poky/meta/recipes-devtools/libtool/libtool/0001-libtool-Fix-support-for-NIOS2-processor.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch b/poky/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch
rename to poky/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch b/poky/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch
rename to poky/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/libtool/libtool/fix-resolve-lt-sysroot.patch b/poky/meta/recipes-devtools/libtool/libtool/fix-resolve-lt-sysroot.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/libtool/libtool/fix-resolve-lt-sysroot.patch
rename to poky/meta/recipes-devtools/libtool/libtool/fix-resolve-lt-sysroot.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/libtool/libtool/fix-rpath.patch b/poky/meta/recipes-devtools/libtool/libtool/fix-rpath.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/libtool/libtool/fix-rpath.patch
rename to poky/meta/recipes-devtools/libtool/libtool/fix-rpath.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/libtool/libtool/fixinstall.patch b/poky/meta/recipes-devtools/libtool/libtool/fixinstall.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/libtool/libtool/fixinstall.patch
rename to poky/meta/recipes-devtools/libtool/libtool/fixinstall.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/libtool/libtool/nohardcodepaths.patch b/poky/meta/recipes-devtools/libtool/libtool/nohardcodepaths.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/libtool/libtool/nohardcodepaths.patch
rename to poky/meta/recipes-devtools/libtool/libtool/nohardcodepaths.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/libtool/libtool/norm-rpath.patch b/poky/meta/recipes-devtools/libtool/libtool/norm-rpath.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/libtool/libtool/norm-rpath.patch
rename to poky/meta/recipes-devtools/libtool/libtool/norm-rpath.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/libtool/libtool/prefix.patch b/poky/meta/recipes-devtools/libtool/libtool/prefix.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/libtool/libtool/prefix.patch
rename to poky/meta/recipes-devtools/libtool/libtool/prefix.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch b/poky/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch
rename to poky/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/libtool/libtool/trailingslash.patch b/poky/meta/recipes-devtools/libtool/libtool/trailingslash.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/libtool/libtool/trailingslash.patch
rename to poky/meta/recipes-devtools/libtool/libtool/trailingslash.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/libtool/libtool/unwind-opt-parsing.patch b/poky/meta/recipes-devtools/libtool/libtool/unwind-opt-parsing.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/libtool/libtool/unwind-opt-parsing.patch
rename to poky/meta/recipes-devtools/libtool/libtool/unwind-opt-parsing.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/libtool/libtool/use-sysroot-in-libpath.patch b/poky/meta/recipes-devtools/libtool/libtool/use-sysroot-in-libpath.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/libtool/libtool/use-sysroot-in-libpath.patch
rename to poky/meta/recipes-devtools/libtool/libtool/use-sysroot-in-libpath.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/libtool/libtool_2.4.6.bb b/poky/meta/recipes-devtools/libtool/libtool_2.4.6.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/libtool/libtool_2.4.6.bb
rename to poky/meta/recipes-devtools/libtool/libtool_2.4.6.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.6.bb b/poky/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.6.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.6.bb
rename to poky/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.6.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/llvm/llvm/0001-Disable-generating-a-native-llvm-config.patch b/poky/meta/recipes-devtools/llvm/llvm/0001-Disable-generating-a-native-llvm-config.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/llvm/llvm/0001-Disable-generating-a-native-llvm-config.patch
rename to poky/meta/recipes-devtools/llvm/llvm/0001-Disable-generating-a-native-llvm-config.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/llvm/llvm/0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch b/poky/meta/recipes-devtools/llvm/llvm/0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/llvm/llvm/0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
rename to poky/meta/recipes-devtools/llvm/llvm/0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/llvm/llvm/0002-llvm-allow-env-override-of-exe-path.patch b/poky/meta/recipes-devtools/llvm/llvm/0002-llvm-allow-env-override-of-exe-path.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/llvm/llvm/0002-llvm-allow-env-override-of-exe-path.patch
rename to poky/meta/recipes-devtools/llvm/llvm/0002-llvm-allow-env-override-of-exe-path.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/llvm/llvm_git.bb b/poky/meta/recipes-devtools/llvm/llvm_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/llvm/llvm_git.bb
rename to poky/meta/recipes-devtools/llvm/llvm_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/m4/m4-1.4.18.inc b/poky/meta/recipes-devtools/m4/m4-1.4.18.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/m4/m4-1.4.18.inc
rename to poky/meta/recipes-devtools/m4/m4-1.4.18.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/m4/m4-native_1.4.18.bb b/poky/meta/recipes-devtools/m4/m4-native_1.4.18.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/m4/m4-native_1.4.18.bb
rename to poky/meta/recipes-devtools/m4/m4-native_1.4.18.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/m4/m4/0001-Unset-need_charset_alias-when-building-for-musl.patch b/poky/meta/recipes-devtools/m4/m4/0001-Unset-need_charset_alias-when-building-for-musl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/m4/m4/0001-Unset-need_charset_alias-when-building-for-musl.patch
rename to poky/meta/recipes-devtools/m4/m4/0001-Unset-need_charset_alias-when-building-for-musl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/m4/m4/ac_config_links.patch b/poky/meta/recipes-devtools/m4/m4/ac_config_links.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/m4/m4/ac_config_links.patch
rename to poky/meta/recipes-devtools/m4/m4/ac_config_links.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/m4/m4/remove-gets.patch b/poky/meta/recipes-devtools/m4/m4/remove-gets.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/m4/m4/remove-gets.patch
rename to poky/meta/recipes-devtools/m4/m4/remove-gets.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/m4/m4_1.4.18.bb b/poky/meta/recipes-devtools/m4/m4_1.4.18.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/m4/m4_1.4.18.bb
rename to poky/meta/recipes-devtools/m4/m4_1.4.18.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/make/make.inc b/poky/meta/recipes-devtools/make/make.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/make/make.inc
rename to poky/meta/recipes-devtools/make/make.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch b/poky/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch
rename to poky/meta/recipes-devtools/make/make/0001-glob-Do-not-assume-glibc-glob-internals.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch b/poky/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch
rename to poky/meta/recipes-devtools/make/make/0002-glob-Do-not-assume-glibc-glob-internals.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/make/make_4.2.1.bb b/poky/meta/recipes-devtools/make/make_4.2.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/make/make_4.2.1.bb
rename to poky/meta/recipes-devtools/make/make_4.2.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/makedevs/makedevs/COPYING.patch b/poky/meta/recipes-devtools/makedevs/makedevs/COPYING.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/makedevs/makedevs/COPYING.patch
rename to poky/meta/recipes-devtools/makedevs/makedevs/COPYING.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/makedevs/makedevs/makedevs.c b/poky/meta/recipes-devtools/makedevs/makedevs/makedevs.c
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/makedevs/makedevs/makedevs.c
rename to poky/meta/recipes-devtools/makedevs/makedevs/makedevs.c
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb b/poky/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb
rename to poky/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/meson/meson/0001-Linker-rules-move-cross_args-in-front-of-output_args.patch b/poky/meta/recipes-devtools/meson/meson/0001-Linker-rules-move-cross_args-in-front-of-output_args.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/meson/meson/0001-Linker-rules-move-cross_args-in-front-of-output_args.patch
rename to poky/meta/recipes-devtools/meson/meson/0001-Linker-rules-move-cross_args-in-front-of-output_args.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch b/poky/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
rename to poky/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/meson/meson/0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch b/poky/meta/recipes-devtools/meson/meson/0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/meson/meson/0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch
rename to poky/meta/recipes-devtools/meson/meson/0002-gobject-introspection-determine-g-ir-scanner-and-g-i.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/poky/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
rename to poky/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/meson/meson_0.44.1.bb b/poky/meta/recipes-devtools/meson/meson_0.44.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/meson/meson_0.44.1.bb
rename to poky/meta/recipes-devtools/meson/meson_0.44.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/mklibs/files/ac_init_fix.patch b/poky/meta/recipes-devtools/mklibs/files/ac_init_fix.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/mklibs/files/ac_init_fix.patch
rename to poky/meta/recipes-devtools/mklibs/files/ac_init_fix.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/mklibs/files/avoid-failure-on-symbol-provided-by-application.patch b/poky/meta/recipes-devtools/mklibs/files/avoid-failure-on-symbol-provided-by-application.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/mklibs/files/avoid-failure-on-symbol-provided-by-application.patch
rename to poky/meta/recipes-devtools/mklibs/files/avoid-failure-on-symbol-provided-by-application.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/mklibs/files/fix_STT_GNU_IFUNC.patch b/poky/meta/recipes-devtools/mklibs/files/fix_STT_GNU_IFUNC.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/mklibs/files/fix_STT_GNU_IFUNC.patch
rename to poky/meta/recipes-devtools/mklibs/files/fix_STT_GNU_IFUNC.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/mklibs/files/fix_cross_compile.patch b/poky/meta/recipes-devtools/mklibs/files/fix_cross_compile.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/mklibs/files/fix_cross_compile.patch
rename to poky/meta/recipes-devtools/mklibs/files/fix_cross_compile.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/mklibs/files/show-GNU-unique-symbols-as-provided-symbols.patch b/poky/meta/recipes-devtools/mklibs/files/show-GNU-unique-symbols-as-provided-symbols.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/mklibs/files/show-GNU-unique-symbols-as-provided-symbols.patch
rename to poky/meta/recipes-devtools/mklibs/files/show-GNU-unique-symbols-as-provided-symbols.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/mklibs/files/sysrooted-ldso.patch b/poky/meta/recipes-devtools/mklibs/files/sysrooted-ldso.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/mklibs/files/sysrooted-ldso.patch
rename to poky/meta/recipes-devtools/mklibs/files/sysrooted-ldso.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/mklibs/mklibs-native_0.1.43.bb b/poky/meta/recipes-devtools/mklibs/mklibs-native_0.1.43.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/mklibs/mklibs-native_0.1.43.bb
rename to poky/meta/recipes-devtools/mklibs/mklibs-native_0.1.43.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/mmc/mmc-utils/0001-lsmmc-replace-strncpy-with-memmove-on-overlapping-me.patch b/poky/meta/recipes-devtools/mmc/mmc-utils/0001-lsmmc-replace-strncpy-with-memmove-on-overlapping-me.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/mmc/mmc-utils/0001-lsmmc-replace-strncpy-with-memmove-on-overlapping-me.patch
rename to poky/meta/recipes-devtools/mmc/mmc-utils/0001-lsmmc-replace-strncpy-with-memmove-on-overlapping-me.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/mmc/mmc-utils_git.bb b/poky/meta/recipes-devtools/mmc/mmc-utils_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/mmc/mmc-utils_git.bb
rename to poky/meta/recipes-devtools/mmc/mmc-utils_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/mtd/mtd-utils/0001-Revert-Return-correct-error-number-in-ubi_get_vol_in.patch b/poky/meta/recipes-devtools/mtd/mtd-utils/0001-Revert-Return-correct-error-number-in-ubi_get_vol_in.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/mtd/mtd-utils/0001-Revert-Return-correct-error-number-in-ubi_get_vol_in.patch
rename to poky/meta/recipes-devtools/mtd/mtd-utils/0001-Revert-Return-correct-error-number-in-ubi_get_vol_in.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git-2.patch b/poky/meta/recipes-devtools/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git-2.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git-2.patch
rename to poky/meta/recipes-devtools/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git-2.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/mtd/mtd-utils_git.bb b/poky/meta/recipes-devtools/mtd/mtd-utils_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/mtd/mtd-utils_git.bb
rename to poky/meta/recipes-devtools/mtd/mtd-utils_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/mtools/mtools/0001-Continue-even-if-fs-size-is-not-divisible-by-sectors.patch b/poky/meta/recipes-devtools/mtools/mtools/0001-Continue-even-if-fs-size-is-not-divisible-by-sectors.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/mtools/mtools/0001-Continue-even-if-fs-size-is-not-divisible-by-sectors.patch
rename to poky/meta/recipes-devtools/mtools/mtools/0001-Continue-even-if-fs-size-is-not-divisible-by-sectors.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch b/poky/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch
rename to poky/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch b/poky/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch
rename to poky/meta/recipes-devtools/mtools/mtools/mtools-makeinfo.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch b/poky/meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch
rename to poky/meta/recipes-devtools/mtools/mtools/no-x11.gplv3.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/mtools/mtools_4.0.18.bb b/poky/meta/recipes-devtools/mtools/mtools_4.0.18.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/mtools/mtools_4.0.18.bb
rename to poky/meta/recipes-devtools/mtools/mtools_4.0.18.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/nasm/nasm/0001-asmlib-Drop-pure-function-attribute-from-seg_init.patch b/poky/meta/recipes-devtools/nasm/nasm/0001-asmlib-Drop-pure-function-attribute-from-seg_init.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/nasm/nasm/0001-asmlib-Drop-pure-function-attribute-from-seg_init.patch
rename to poky/meta/recipes-devtools/nasm/nasm/0001-asmlib-Drop-pure-function-attribute-from-seg_init.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/nasm/nasm_2.13.03.bb b/poky/meta/recipes-devtools/nasm/nasm_2.13.03.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/nasm/nasm_2.13.03.bb
rename to poky/meta/recipes-devtools/nasm/nasm_2.13.03.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/ninja/ninja_1.8.2.bb b/poky/meta/recipes-devtools/ninja/ninja_1.8.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/ninja/ninja_1.8.2.bb
rename to poky/meta/recipes-devtools/ninja/ninja_1.8.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Only-use-sort-name-on-versions-of-tar-which-support-.patch b/poky/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Only-use-sort-name-on-versions-of-tar-which-support-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Only-use-sort-name-on-versions-of-tar-which-support-.patch
rename to poky/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Only-use-sort-name-on-versions-of-tar-which-support-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Switch-all-scripts-to-use-Python-3.x.patch b/poky/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Switch-all-scripts-to-use-Python-3.x.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Switch-all-scripts-to-use-Python-3.x.patch
rename to poky/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Switch-all-scripts-to-use-Python-3.x.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/opkg-utils/opkg-utils/0002-opkg-build-Use-local-time-for-build_date-since-opkg-.patch b/poky/meta/recipes-devtools/opkg-utils/opkg-utils/0002-opkg-build-Use-local-time-for-build_date-since-opkg-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/opkg-utils/opkg-utils/0002-opkg-build-Use-local-time-for-build_date-since-opkg-.patch
rename to poky/meta/recipes-devtools/opkg-utils/opkg-utils/0002-opkg-build-Use-local-time-for-build_date-since-opkg-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch b/poky/meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch
rename to poky/meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/opkg-utils/opkg-utils/threaded-xz.patch b/poky/meta/recipes-devtools/opkg-utils/opkg-utils/threaded-xz.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/opkg-utils/opkg-utils/threaded-xz.patch
rename to poky/meta/recipes-devtools/opkg-utils/opkg-utils/threaded-xz.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/opkg-utils/opkg-utils_0.3.6.bb b/poky/meta/recipes-devtools/opkg-utils/opkg-utils_0.3.6.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/opkg-utils/opkg-utils_0.3.6.bb
rename to poky/meta/recipes-devtools/opkg-utils/opkg-utils_0.3.6.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb b/poky/meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb
rename to poky/meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/opkg/opkg-keyrings_1.0.bb b/poky/meta/recipes-devtools/opkg/opkg-keyrings_1.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/opkg/opkg-keyrings_1.0.bb
rename to poky/meta/recipes-devtools/opkg/opkg-keyrings_1.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/opkg/opkg/0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch b/poky/meta/recipes-devtools/opkg/opkg/0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/opkg/opkg/0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch
rename to poky/meta/recipes-devtools/opkg/opkg/0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/opkg/opkg/opkg-configure.service b/poky/meta/recipes-devtools/opkg/opkg/opkg-configure.service
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/opkg/opkg/opkg-configure.service
rename to poky/meta/recipes-devtools/opkg/opkg/opkg-configure.service
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/opkg/opkg/opkg.conf b/poky/meta/recipes-devtools/opkg/opkg/opkg.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/opkg/opkg/opkg.conf
rename to poky/meta/recipes-devtools/opkg/opkg/opkg.conf
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/opkg/opkg_0.3.6.bb b/poky/meta/recipes-devtools/opkg/opkg_0.3.6.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/opkg/opkg_0.3.6.bb
rename to poky/meta/recipes-devtools/opkg/opkg_0.3.6.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/orc/orc_0.4.28.bb b/poky/meta/recipes-devtools/orc/orc_0.4.28.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/orc/orc_0.4.28.bb
rename to poky/meta/recipes-devtools/orc/orc_0.4.28.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/0001-Change-library-name.patch b/poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/0001-Change-library-name.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/0001-Change-library-name.patch
rename to poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/0001-Change-library-name.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/0002-uuid-preserve-m-option-status-in-v-option-handling.patch b/poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/0002-uuid-preserve-m-option-status-in-v-option-handling.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/0002-uuid-preserve-m-option-status-in-v-option-handling.patch
rename to poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/0002-uuid-preserve-m-option-status-in-v-option-handling.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/0003-Fix-whatis-entries.patch b/poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/0003-Fix-whatis-entries.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/0003-Fix-whatis-entries.patch
rename to poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/0003-Fix-whatis-entries.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch b/poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch
rename to poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/0004-fix-data-uuid-from-string.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/install-pc.patch b/poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/install-pc.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/install-pc.patch
rename to poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/install-pc.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch b/poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch
rename to poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/libtool-tag.patch b/poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/libtool-tag.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/libtool-tag.patch
rename to poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/libtool-tag.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-libtool.patch b/poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-libtool.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-libtool.patch
rename to poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-libtool.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-nostrip.patch b/poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-nostrip.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-nostrip.patch
rename to poky/meta/recipes-devtools/ossp-uuid/ossp-uuid/uuid-nostrip.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb b/poky/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb
rename to poky/meta/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/packagegroups/packagegroup-core-device-devel.bb b/poky/meta/recipes-devtools/packagegroups/packagegroup-core-device-devel.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/packagegroups/packagegroup-core-device-devel.bb
rename to poky/meta/recipes-devtools/packagegroups/packagegroup-core-device-devel.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/patch/patch.inc b/poky/meta/recipes-devtools/patch/patch.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/patch/patch.inc
rename to poky/meta/recipes-devtools/patch/patch.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/patch/patch/0001-Unset-need_charset_alias-when-building-for-musl.patch b/poky/meta/recipes-devtools/patch/patch/0001-Unset-need_charset_alias-when-building-for-musl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/patch/patch/0001-Unset-need_charset_alias-when-building-for-musl.patch
rename to poky/meta/recipes-devtools/patch/patch/0001-Unset-need_charset_alias-when-building-for-musl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/patch/patch/0002-Fix-segfault-with-mangled-rename-patch.patch b/poky/meta/recipes-devtools/patch/patch/0002-Fix-segfault-with-mangled-rename-patch.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/patch/patch/0002-Fix-segfault-with-mangled-rename-patch.patch
rename to poky/meta/recipes-devtools/patch/patch/0002-Fix-segfault-with-mangled-rename-patch.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/patch/patch/0003-Allow-input-files-to-be-missing-for-ed-style-patches.patch b/poky/meta/recipes-devtools/patch/patch/0003-Allow-input-files-to-be-missing-for-ed-style-patches.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/patch/patch/0003-Allow-input-files-to-be-missing-for-ed-style-patches.patch
rename to poky/meta/recipes-devtools/patch/patch/0003-Allow-input-files-to-be-missing-for-ed-style-patches.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/patch/patch/0004-Fix-arbitrary-command-execution-in-ed-style-patches-.patch b/poky/meta/recipes-devtools/patch/patch/0004-Fix-arbitrary-command-execution-in-ed-style-patches-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/patch/patch/0004-Fix-arbitrary-command-execution-in-ed-style-patches-.patch
rename to poky/meta/recipes-devtools/patch/patch/0004-Fix-arbitrary-command-execution-in-ed-style-patches-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/patch/patch_2.7.6.bb b/poky/meta/recipes-devtools/patch/patch_2.7.6.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/patch/patch_2.7.6.bb
rename to poky/meta/recipes-devtools/patch/patch_2.7.6.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/patchelf/patchelf/Increase-maxSize-to-64MB.patch b/poky/meta/recipes-devtools/patchelf/patchelf/Increase-maxSize-to-64MB.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/patchelf/patchelf/Increase-maxSize-to-64MB.patch
rename to poky/meta/recipes-devtools/patchelf/patchelf/Increase-maxSize-to-64MB.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/patchelf/patchelf/Skip-empty-section-fixes-66.patch b/poky/meta/recipes-devtools/patchelf/patchelf/Skip-empty-section-fixes-66.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/patchelf/patchelf/Skip-empty-section-fixes-66.patch
rename to poky/meta/recipes-devtools/patchelf/patchelf/Skip-empty-section-fixes-66.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/patchelf/patchelf/avoidholes.patch b/poky/meta/recipes-devtools/patchelf/patchelf/avoidholes.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/patchelf/patchelf/avoidholes.patch
rename to poky/meta/recipes-devtools/patchelf/patchelf/avoidholes.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/patchelf/patchelf/fix-adjusting-startPage.patch b/poky/meta/recipes-devtools/patchelf/patchelf/fix-adjusting-startPage.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/patchelf/patchelf/fix-adjusting-startPage.patch
rename to poky/meta/recipes-devtools/patchelf/patchelf/fix-adjusting-startPage.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch b/poky/meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch
rename to poky/meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/patchelf/patchelf_0.9.bb b/poky/meta/recipes-devtools/patchelf/patchelf_0.9.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/patchelf/patchelf_0.9.bb
rename to poky/meta/recipes-devtools/patchelf/patchelf_0.9.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb b/poky/meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb
rename to poky/meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/liberror-perl_0.17025.bb b/poky/meta/recipes-devtools/perl/liberror-perl_0.17025.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/liberror-perl_0.17025.bb
rename to poky/meta/recipes-devtools/perl/liberror-perl_0.17025.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/libtest-needs-perl_0.002005.bb b/poky/meta/recipes-devtools/perl/libtest-needs-perl_0.002005.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/libtest-needs-perl_0.002005.bb
rename to poky/meta/recipes-devtools/perl/libtest-needs-perl_0.002005.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/liburi-perl_1.73.bb b/poky/meta/recipes-devtools/perl/liburi-perl_1.73.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/liburi-perl_1.73.bb
rename to poky/meta/recipes-devtools/perl/liburi-perl_1.73.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/libxml-parser-perl_2.44.bb b/poky/meta/recipes-devtools/perl/libxml-parser-perl_2.44.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/libxml-parser-perl_2.44.bb
rename to poky/meta/recipes-devtools/perl/libxml-parser-perl_2.44.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/libxml-perl_0.08.bb b/poky/meta/recipes-devtools/perl/libxml-perl_0.08.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/libxml-perl_0.08.bb
rename to poky/meta/recipes-devtools/perl/libxml-perl_0.08.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/libxml-simple-perl_2.24.bb b/poky/meta/recipes-devtools/perl/libxml-simple-perl_2.24.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/libxml-simple-perl_2.24.bb
rename to poky/meta/recipes-devtools/perl/libxml-simple-perl_2.24.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl-native_5.24.1.bb b/poky/meta/recipes-devtools/perl/perl-native_5.24.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl-native_5.24.1.bb
rename to poky/meta/recipes-devtools/perl/perl-native_5.24.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl-ptest.inc b/poky/meta/recipes-devtools/perl/perl-ptest.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl-ptest.inc
rename to poky/meta/recipes-devtools/perl/perl-ptest.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl-rdepends_5.24.1.inc b/poky/meta/recipes-devtools/perl/perl-rdepends_5.24.1.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl-rdepends_5.24.1.inc
rename to poky/meta/recipes-devtools/perl/perl-rdepends_5.24.1.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl.inc b/poky/meta/recipes-devtools/perl/perl.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl.inc
rename to poky/meta/recipes-devtools/perl/perl.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/0001-Configure-Remove-fstack-protector-strong-for-native-.patch b/poky/meta/recipes-devtools/perl/perl/0001-Configure-Remove-fstack-protector-strong-for-native-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/0001-Configure-Remove-fstack-protector-strong-for-native-.patch
rename to poky/meta/recipes-devtools/perl/perl/0001-Configure-Remove-fstack-protector-strong-for-native-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/CVE-2017-12837.patch b/poky/meta/recipes-devtools/perl/perl/CVE-2017-12837.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/CVE-2017-12837.patch
rename to poky/meta/recipes-devtools/perl/perl/CVE-2017-12837.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/CVE-2017-12883.patch b/poky/meta/recipes-devtools/perl/perl/CVE-2017-12883.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/CVE-2017-12883.patch
rename to poky/meta/recipes-devtools/perl/perl/CVE-2017-12883.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/Configure-multilib.patch b/poky/meta/recipes-devtools/perl/perl/Configure-multilib.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/Configure-multilib.patch
rename to poky/meta/recipes-devtools/perl/perl/Configure-multilib.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/MM_Unix.pm.patch b/poky/meta/recipes-devtools/perl/perl/MM_Unix.pm.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/MM_Unix.pm.patch
rename to poky/meta/recipes-devtools/perl/perl/MM_Unix.pm.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/Makefile.SH.patch b/poky/meta/recipes-devtools/perl/perl/Makefile.SH.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/Makefile.SH.patch
rename to poky/meta/recipes-devtools/perl/perl/Makefile.SH.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/Makefile.patch b/poky/meta/recipes-devtools/perl/perl/Makefile.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/Makefile.patch
rename to poky/meta/recipes-devtools/perl/perl/Makefile.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/config.sh b/poky/meta/recipes-devtools/perl/perl/config.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/config.sh
rename to poky/meta/recipes-devtools/perl/perl/config.sh
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/config.sh-32 b/poky/meta/recipes-devtools/perl/perl/config.sh-32
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/config.sh-32
rename to poky/meta/recipes-devtools/perl/perl/config.sh-32
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/config.sh-32-be b/poky/meta/recipes-devtools/perl/perl/config.sh-32-be
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/config.sh-32-be
rename to poky/meta/recipes-devtools/perl/perl/config.sh-32-be
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/config.sh-32-le b/poky/meta/recipes-devtools/perl/perl/config.sh-32-le
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/config.sh-32-le
rename to poky/meta/recipes-devtools/perl/perl/config.sh-32-le
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/config.sh-64 b/poky/meta/recipes-devtools/perl/perl/config.sh-64
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/config.sh-64
rename to poky/meta/recipes-devtools/perl/perl/config.sh-64
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/config.sh-64-be b/poky/meta/recipes-devtools/perl/perl/config.sh-64-be
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/config.sh-64-be
rename to poky/meta/recipes-devtools/perl/perl/config.sh-64-be
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/config.sh-64-le b/poky/meta/recipes-devtools/perl/perl/config.sh-64-le
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/config.sh-64-le
rename to poky/meta/recipes-devtools/perl/perl/config.sh-64-le
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/cross-generate_uudmap.patch b/poky/meta/recipes-devtools/perl/perl/cross-generate_uudmap.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/cross-generate_uudmap.patch
rename to poky/meta/recipes-devtools/perl/perl/cross-generate_uudmap.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/cpan-missing-site-dirs.diff b/poky/meta/recipes-devtools/perl/perl/debian/cpan-missing-site-dirs.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/cpan-missing-site-dirs.diff
rename to poky/meta/recipes-devtools/perl/perl/debian/cpan-missing-site-dirs.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/cpan_definstalldirs.diff b/poky/meta/recipes-devtools/perl/perl/debian/cpan_definstalldirs.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/cpan_definstalldirs.diff
rename to poky/meta/recipes-devtools/perl/perl/debian/cpan_definstalldirs.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/db_file_ver.diff b/poky/meta/recipes-devtools/perl/perl/debian/db_file_ver.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/db_file_ver.diff
rename to poky/meta/recipes-devtools/perl/perl/debian/db_file_ver.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/deprecate-with-apt.diff b/poky/meta/recipes-devtools/perl/perl/debian/deprecate-with-apt.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/deprecate-with-apt.diff
rename to poky/meta/recipes-devtools/perl/perl/debian/deprecate-with-apt.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/doc_info.diff b/poky/meta/recipes-devtools/perl/perl/debian/doc_info.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/doc_info.diff
rename to poky/meta/recipes-devtools/perl/perl/debian/doc_info.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/enc2xs_inc.diff b/poky/meta/recipes-devtools/perl/perl/debian/enc2xs_inc.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/enc2xs_inc.diff
rename to poky/meta/recipes-devtools/perl/perl/debian/enc2xs_inc.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/errno_ver.diff b/poky/meta/recipes-devtools/perl/perl/debian/errno_ver.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/errno_ver.diff
rename to poky/meta/recipes-devtools/perl/perl/debian/errno_ver.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/extutils_set_libperl_path.diff b/poky/meta/recipes-devtools/perl/perl/debian/extutils_set_libperl_path.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/extutils_set_libperl_path.diff
rename to poky/meta/recipes-devtools/perl/perl/debian/extutils_set_libperl_path.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/fakeroot.diff b/poky/meta/recipes-devtools/perl/perl/debian/fakeroot.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/fakeroot.diff
rename to poky/meta/recipes-devtools/perl/perl/debian/fakeroot.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/find_html2text.diff b/poky/meta/recipes-devtools/perl/perl/debian/find_html2text.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/find_html2text.diff
rename to poky/meta/recipes-devtools/perl/perl/debian/find_html2text.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/fixes/document_makemaker_ccflags.diff b/poky/meta/recipes-devtools/perl/perl/debian/fixes/document_makemaker_ccflags.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/fixes/document_makemaker_ccflags.diff
rename to poky/meta/recipes-devtools/perl/perl/debian/fixes/document_makemaker_ccflags.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/fixes/memoize_storable_nstore.diff b/poky/meta/recipes-devtools/perl/perl/debian/fixes/memoize_storable_nstore.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/fixes/memoize_storable_nstore.diff
rename to poky/meta/recipes-devtools/perl/perl/debian/fixes/memoize_storable_nstore.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/fixes/net_smtp_docs.diff b/poky/meta/recipes-devtools/perl/perl/debian/fixes/net_smtp_docs.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/fixes/net_smtp_docs.diff
rename to poky/meta/recipes-devtools/perl/perl/debian/fixes/net_smtp_docs.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/fixes/perl-Cnn.diff b/poky/meta/recipes-devtools/perl/perl/debian/fixes/perl-Cnn.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/fixes/perl-Cnn.diff
rename to poky/meta/recipes-devtools/perl/perl/debian/fixes/perl-Cnn.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/fixes/pod_man_reproducible_date.diff b/poky/meta/recipes-devtools/perl/perl/debian/fixes/pod_man_reproducible_date.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/fixes/pod_man_reproducible_date.diff
rename to poky/meta/recipes-devtools/perl/perl/debian/fixes/pod_man_reproducible_date.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/fixes/podman-empty-date.diff b/poky/meta/recipes-devtools/perl/perl/debian/fixes/podman-empty-date.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/fixes/podman-empty-date.diff
rename to poky/meta/recipes-devtools/perl/perl/debian/fixes/podman-empty-date.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/fixes/podman-pipe.diff b/poky/meta/recipes-devtools/perl/perl/debian/fixes/podman-pipe.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/fixes/podman-pipe.diff
rename to poky/meta/recipes-devtools/perl/perl/debian/fixes/podman-pipe.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/fixes/podman-utc-docs.diff b/poky/meta/recipes-devtools/perl/perl/debian/fixes/podman-utc-docs.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/fixes/podman-utc-docs.diff
rename to poky/meta/recipes-devtools/perl/perl/debian/fixes/podman-utc-docs.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/fixes/podman-utc.diff b/poky/meta/recipes-devtools/perl/perl/debian/fixes/podman-utc.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/fixes/podman-utc.diff
rename to poky/meta/recipes-devtools/perl/perl/debian/fixes/podman-utc.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/fixes/respect_umask.diff b/poky/meta/recipes-devtools/perl/perl/debian/fixes/respect_umask.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/fixes/respect_umask.diff
rename to poky/meta/recipes-devtools/perl/perl/debian/fixes/respect_umask.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/instmodsh_doc.diff b/poky/meta/recipes-devtools/perl/perl/debian/instmodsh_doc.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/instmodsh_doc.diff
rename to poky/meta/recipes-devtools/perl/perl/debian/instmodsh_doc.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/ld_run_path.diff b/poky/meta/recipes-devtools/perl/perl/debian/ld_run_path.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/ld_run_path.diff
rename to poky/meta/recipes-devtools/perl/perl/debian/ld_run_path.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/libnet_config_path.diff b/poky/meta/recipes-devtools/perl/perl/debian/libnet_config_path.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/libnet_config_path.diff
rename to poky/meta/recipes-devtools/perl/perl/debian/libnet_config_path.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/libperl_embed_doc.diff b/poky/meta/recipes-devtools/perl/perl/debian/libperl_embed_doc.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/libperl_embed_doc.diff
rename to poky/meta/recipes-devtools/perl/perl/debian/libperl_embed_doc.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/locale-robustness.diff b/poky/meta/recipes-devtools/perl/perl/debian/locale-robustness.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/locale-robustness.diff
rename to poky/meta/recipes-devtools/perl/perl/debian/locale-robustness.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/makemaker-pasthru.diff b/poky/meta/recipes-devtools/perl/perl/debian/makemaker-pasthru.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/makemaker-pasthru.diff
rename to poky/meta/recipes-devtools/perl/perl/debian/makemaker-pasthru.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/makemaker_customized.diff b/poky/meta/recipes-devtools/perl/perl/debian/makemaker_customized.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/makemaker_customized.diff
rename to poky/meta/recipes-devtools/perl/perl/debian/makemaker_customized.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/mod_paths.diff b/poky/meta/recipes-devtools/perl/perl/debian/mod_paths.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/mod_paths.diff
rename to poky/meta/recipes-devtools/perl/perl/debian/mod_paths.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/no_packlist_perllocal.diff b/poky/meta/recipes-devtools/perl/perl/debian/no_packlist_perllocal.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/no_packlist_perllocal.diff
rename to poky/meta/recipes-devtools/perl/perl/debian/no_packlist_perllocal.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/patchlevel.diff b/poky/meta/recipes-devtools/perl/perl/debian/patchlevel.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/patchlevel.diff
rename to poky/meta/recipes-devtools/perl/perl/debian/patchlevel.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/perl5db-x-terminal-emulator.patch b/poky/meta/recipes-devtools/perl/perl/debian/perl5db-x-terminal-emulator.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/perl5db-x-terminal-emulator.patch
rename to poky/meta/recipes-devtools/perl/perl/debian/perl5db-x-terminal-emulator.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/perlivp.diff b/poky/meta/recipes-devtools/perl/perl/debian/perlivp.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/perlivp.diff
rename to poky/meta/recipes-devtools/perl/perl/debian/perlivp.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/pod2man-customized.diff b/poky/meta/recipes-devtools/perl/perl/debian/pod2man-customized.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/pod2man-customized.diff
rename to poky/meta/recipes-devtools/perl/perl/debian/pod2man-customized.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/prefix_changes.diff b/poky/meta/recipes-devtools/perl/perl/debian/prefix_changes.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/prefix_changes.diff
rename to poky/meta/recipes-devtools/perl/perl/debian/prefix_changes.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/prune_libs.diff b/poky/meta/recipes-devtools/perl/perl/debian/prune_libs.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/prune_libs.diff
rename to poky/meta/recipes-devtools/perl/perl/debian/prune_libs.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/regen-skip.diff b/poky/meta/recipes-devtools/perl/perl/debian/regen-skip.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/regen-skip.diff
rename to poky/meta/recipes-devtools/perl/perl/debian/regen-skip.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/skip-kfreebsd-crash.diff b/poky/meta/recipes-devtools/perl/perl/debian/skip-kfreebsd-crash.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/skip-kfreebsd-crash.diff
rename to poky/meta/recipes-devtools/perl/perl/debian/skip-kfreebsd-crash.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/skip-upstream-git-tests.diff b/poky/meta/recipes-devtools/perl/perl/debian/skip-upstream-git-tests.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/skip-upstream-git-tests.diff
rename to poky/meta/recipes-devtools/perl/perl/debian/skip-upstream-git-tests.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/squelch-locale-warnings.diff b/poky/meta/recipes-devtools/perl/perl/debian/squelch-locale-warnings.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/squelch-locale-warnings.diff
rename to poky/meta/recipes-devtools/perl/perl/debian/squelch-locale-warnings.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/writable_site_dirs.diff b/poky/meta/recipes-devtools/perl/perl/debian/writable_site_dirs.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/debian/writable_site_dirs.diff
rename to poky/meta/recipes-devtools/perl/perl/debian/writable_site_dirs.diff
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/dynaloaderhack.patch b/poky/meta/recipes-devtools/perl/perl/dynaloaderhack.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/dynaloaderhack.patch
rename to poky/meta/recipes-devtools/perl/perl/dynaloaderhack.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/ext-ODBM_File-hints-linux.pl-link-libgdbm_compat.patch b/poky/meta/recipes-devtools/perl/perl/ext-ODBM_File-hints-linux.pl-link-libgdbm_compat.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/ext-ODBM_File-hints-linux.pl-link-libgdbm_compat.patch
rename to poky/meta/recipes-devtools/perl/perl/ext-ODBM_File-hints-linux.pl-link-libgdbm_compat.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/ext-ODBM_File-t-odbm.t-fix-the-path-of-dbmt_common.p.patch b/poky/meta/recipes-devtools/perl/perl/ext-ODBM_File-t-odbm.t-fix-the-path-of-dbmt_common.p.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/ext-ODBM_File-t-odbm.t-fix-the-path-of-dbmt_common.p.patch
rename to poky/meta/recipes-devtools/perl/perl/ext-ODBM_File-t-odbm.t-fix-the-path-of-dbmt_common.p.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/fix_bad_rpath.patch b/poky/meta/recipes-devtools/perl/perl/fix_bad_rpath.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/fix_bad_rpath.patch
rename to poky/meta/recipes-devtools/perl/perl/fix_bad_rpath.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/generate-sh.patch b/poky/meta/recipes-devtools/perl/perl/generate-sh.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/generate-sh.patch
rename to poky/meta/recipes-devtools/perl/perl/generate-sh.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/installperl.patch b/poky/meta/recipes-devtools/perl/perl/installperl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/installperl.patch
rename to poky/meta/recipes-devtools/perl/perl/installperl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/letgcc-find-errno.patch b/poky/meta/recipes-devtools/perl/perl/letgcc-find-errno.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/letgcc-find-errno.patch
rename to poky/meta/recipes-devtools/perl/perl/letgcc-find-errno.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/make_ext.pl-fix-regenerate-makefile-failed-while-cc-.patch b/poky/meta/recipes-devtools/perl/perl/make_ext.pl-fix-regenerate-makefile-failed-while-cc-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/make_ext.pl-fix-regenerate-makefile-failed-while-cc-.patch
rename to poky/meta/recipes-devtools/perl/perl/make_ext.pl-fix-regenerate-makefile-failed-while-cc-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/native-nopacklist.patch b/poky/meta/recipes-devtools/perl/perl/native-nopacklist.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/native-nopacklist.patch
rename to poky/meta/recipes-devtools/perl/perl/native-nopacklist.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/native-perlinc.patch b/poky/meta/recipes-devtools/perl/perl/native-perlinc.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/native-perlinc.patch
rename to poky/meta/recipes-devtools/perl/perl/native-perlinc.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/perl-5.26.1-guard_old_libcrypt_fix.patch b/poky/meta/recipes-devtools/perl/perl/perl-5.26.1-guard_old_libcrypt_fix.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/perl-5.26.1-guard_old_libcrypt_fix.patch
rename to poky/meta/recipes-devtools/perl/perl/perl-5.26.1-guard_old_libcrypt_fix.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/perl-PathTools-don-t-filter-out-blib-from-INC.patch b/poky/meta/recipes-devtools/perl/perl/perl-PathTools-don-t-filter-out-blib-from-INC.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/perl-PathTools-don-t-filter-out-blib-from-INC.patch
rename to poky/meta/recipes-devtools/perl/perl/perl-PathTools-don-t-filter-out-blib-from-INC.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/perl-archlib-exp.patch b/poky/meta/recipes-devtools/perl/perl/perl-archlib-exp.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/perl-archlib-exp.patch
rename to poky/meta/recipes-devtools/perl/perl/perl-archlib-exp.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/perl-configpm-switch.patch b/poky/meta/recipes-devtools/perl/perl/perl-configpm-switch.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/perl-configpm-switch.patch
rename to poky/meta/recipes-devtools/perl/perl/perl-configpm-switch.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/perl-configure.sh b/poky/meta/recipes-devtools/perl/perl/perl-configure.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/perl-configure.sh
rename to poky/meta/recipes-devtools/perl/perl/perl-configure.sh
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/perl-dynloader.patch b/poky/meta/recipes-devtools/perl/perl/perl-dynloader.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/perl-dynloader.patch
rename to poky/meta/recipes-devtools/perl/perl/perl-dynloader.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/perl-errno-generation-gcc5.patch b/poky/meta/recipes-devtools/perl/perl/perl-errno-generation-gcc5.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/perl-errno-generation-gcc5.patch
rename to poky/meta/recipes-devtools/perl/perl/perl-errno-generation-gcc5.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/perl-fix-conflict-between-skip_all-and-END.patch b/poky/meta/recipes-devtools/perl/perl/perl-fix-conflict-between-skip_all-and-END.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/perl-fix-conflict-between-skip_all-and-END.patch
rename to poky/meta/recipes-devtools/perl/perl/perl-fix-conflict-between-skip_all-and-END.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/perl-moreconfig.patch b/poky/meta/recipes-devtools/perl/perl/perl-moreconfig.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/perl-moreconfig.patch
rename to poky/meta/recipes-devtools/perl/perl/perl-moreconfig.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/perl-test-customized.patch b/poky/meta/recipes-devtools/perl/perl/perl-test-customized.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/perl-test-customized.patch
rename to poky/meta/recipes-devtools/perl/perl/perl-test-customized.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/run-ptest b/poky/meta/recipes-devtools/perl/perl/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/run-ptest
rename to poky/meta/recipes-devtools/perl/perl/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/t-run-switches.t-perl5-perl.patch b/poky/meta/recipes-devtools/perl/perl/t-run-switches.t-perl5-perl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/t-run-switches.t-perl5-perl.patch
rename to poky/meta/recipes-devtools/perl/perl/t-run-switches.t-perl5-perl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/test/dist-threads-t-join.t-adjust-ps-option.patch b/poky/meta/recipes-devtools/perl/perl/test/dist-threads-t-join.t-adjust-ps-option.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/test/dist-threads-t-join.t-adjust-ps-option.patch
rename to poky/meta/recipes-devtools/perl/perl/test/dist-threads-t-join.t-adjust-ps-option.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl/test/ext-DynaLoader-t-DynaLoader.t-fix-calling-dl_findfil.patch b/poky/meta/recipes-devtools/perl/perl/test/ext-DynaLoader-t-DynaLoader.t-fix-calling-dl_findfil.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl/test/ext-DynaLoader-t-DynaLoader.t-fix-calling-dl_findfil.patch
rename to poky/meta/recipes-devtools/perl/perl/test/ext-DynaLoader-t-DynaLoader.t-fix-calling-dl_findfil.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/perl/perl_5.24.1.bb b/poky/meta/recipes-devtools/perl/perl_5.24.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/perl/perl_5.24.1.bb
rename to poky/meta/recipes-devtools/perl/perl_5.24.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-esdk.in b/poky/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-esdk.in
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-esdk.in
rename to poky/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-esdk.in
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in b/poky/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in
rename to poky/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-native.in
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper b/poky/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper
rename to poky/meta/recipes-devtools/pkgconf/pkgconf/pkg-config-wrapper
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/pkgconf/pkgconf_1.4.2.bb b/poky/meta/recipes-devtools/pkgconf/pkgconf_1.4.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/pkgconf/pkgconf_1.4.2.bb
rename to poky/meta/recipes-devtools/pkgconf/pkgconf_1.4.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/pkgconfig/pkgconfig/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch b/poky/meta/recipes-devtools/pkgconfig/pkgconfig/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/pkgconfig/pkgconfig/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch
rename to poky/meta/recipes-devtools/pkgconfig/pkgconfig/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/pkgconfig/pkgconfig/fix-glib-configure-libtool-usage.patch b/poky/meta/recipes-devtools/pkgconfig/pkgconfig/fix-glib-configure-libtool-usage.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/pkgconfig/pkgconfig/fix-glib-configure-libtool-usage.patch
rename to poky/meta/recipes-devtools/pkgconfig/pkgconfig/fix-glib-configure-libtool-usage.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-esdk.in b/poky/meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-esdk.in
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-esdk.in
rename to poky/meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-esdk.in
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-native.in b/poky/meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-native.in
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-native.in
rename to poky/meta/recipes-devtools/pkgconfig/pkgconfig/pkg-config-native.in
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb b/poky/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
rename to poky/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/prelink/prelink/macros.prelink b/poky/meta/recipes-devtools/prelink/prelink/macros.prelink
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/prelink/prelink/macros.prelink
rename to poky/meta/recipes-devtools/prelink/prelink/macros.prelink
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/prelink/prelink/prelink.conf b/poky/meta/recipes-devtools/prelink/prelink/prelink.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/prelink/prelink/prelink.conf
rename to poky/meta/recipes-devtools/prelink/prelink/prelink.conf
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/prelink/prelink/prelink.cron.daily b/poky/meta/recipes-devtools/prelink/prelink/prelink.cron.daily
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/prelink/prelink/prelink.cron.daily
rename to poky/meta/recipes-devtools/prelink/prelink/prelink.cron.daily
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/prelink/prelink/prelink.default b/poky/meta/recipes-devtools/prelink/prelink/prelink.default
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/prelink/prelink/prelink.default
rename to poky/meta/recipes-devtools/prelink/prelink/prelink.default
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/prelink/prelink_git.bb b/poky/meta/recipes-devtools/prelink/prelink_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/prelink/prelink_git.bb
rename to poky/meta/recipes-devtools/prelink/prelink_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/pseudo/files/0001-configure-Prune-PIE-flags.patch b/poky/meta/recipes-devtools/pseudo/files/0001-configure-Prune-PIE-flags.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/pseudo/files/0001-configure-Prune-PIE-flags.patch
rename to poky/meta/recipes-devtools/pseudo/files/0001-configure-Prune-PIE-flags.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/pseudo/files/fallback-group b/poky/meta/recipes-devtools/pseudo/files/fallback-group
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/pseudo/files/fallback-group
rename to poky/meta/recipes-devtools/pseudo/files/fallback-group
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/pseudo/files/fallback-passwd b/poky/meta/recipes-devtools/pseudo/files/fallback-passwd
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/pseudo/files/fallback-passwd
rename to poky/meta/recipes-devtools/pseudo/files/fallback-passwd
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/pseudo/files/moreretries.patch b/poky/meta/recipes-devtools/pseudo/files/moreretries.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/pseudo/files/moreretries.patch
rename to poky/meta/recipes-devtools/pseudo/files/moreretries.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/pseudo/files/toomanyfiles.patch b/poky/meta/recipes-devtools/pseudo/files/toomanyfiles.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/pseudo/files/toomanyfiles.patch
rename to poky/meta/recipes-devtools/pseudo/files/toomanyfiles.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/pseudo/pseudo.inc b/poky/meta/recipes-devtools/pseudo/pseudo.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/pseudo/pseudo.inc
rename to poky/meta/recipes-devtools/pseudo/pseudo.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/pseudo/pseudo_git.bb b/poky/meta/recipes-devtools/pseudo/pseudo_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/pseudo/pseudo_git.bb
rename to poky/meta/recipes-devtools/pseudo/pseudo_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch b/poky/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch
rename to poky/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/0001-npy_cpu-Add-riscv-support.patch b/poky/meta/recipes-devtools/python-numpy/files/0001-npy_cpu-Add-riscv-support.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/0001-npy_cpu-Add-riscv-support.patch
rename to poky/meta/recipes-devtools/python-numpy/files/0001-npy_cpu-Add-riscv-support.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/aarch64/_numpyconfig.h b/poky/meta/recipes-devtools/python-numpy/files/aarch64/_numpyconfig.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/aarch64/_numpyconfig.h
rename to poky/meta/recipes-devtools/python-numpy/files/aarch64/_numpyconfig.h
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/aarch64/config.h b/poky/meta/recipes-devtools/python-numpy/files/aarch64/config.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/aarch64/config.h
rename to poky/meta/recipes-devtools/python-numpy/files/aarch64/config.h
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/arm/config.h b/poky/meta/recipes-devtools/python-numpy/files/arm/config.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/arm/config.h
rename to poky/meta/recipes-devtools/python-numpy/files/arm/config.h
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/arm/numpyconfig.h b/poky/meta/recipes-devtools/python-numpy/files/arm/numpyconfig.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/arm/numpyconfig.h
rename to poky/meta/recipes-devtools/python-numpy/files/arm/numpyconfig.h
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/armeb/config.h b/poky/meta/recipes-devtools/python-numpy/files/armeb/config.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/armeb/config.h
rename to poky/meta/recipes-devtools/python-numpy/files/armeb/config.h
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/armeb/numpyconfig.h b/poky/meta/recipes-devtools/python-numpy/files/armeb/numpyconfig.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/armeb/numpyconfig.h
rename to poky/meta/recipes-devtools/python-numpy/files/armeb/numpyconfig.h
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/fix_shebang_f2py.patch b/poky/meta/recipes-devtools/python-numpy/files/fix_shebang_f2py.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/fix_shebang_f2py.patch
rename to poky/meta/recipes-devtools/python-numpy/files/fix_shebang_f2py.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/mipsarchn32eb/_numpyconfig.h b/poky/meta/recipes-devtools/python-numpy/files/mipsarchn32eb/_numpyconfig.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/mipsarchn32eb/_numpyconfig.h
rename to poky/meta/recipes-devtools/python-numpy/files/mipsarchn32eb/_numpyconfig.h
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/mipsarchn32eb/config.h b/poky/meta/recipes-devtools/python-numpy/files/mipsarchn32eb/config.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/mipsarchn32eb/config.h
rename to poky/meta/recipes-devtools/python-numpy/files/mipsarchn32eb/config.h
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/mipsarchn32el/_numpyconfig.h b/poky/meta/recipes-devtools/python-numpy/files/mipsarchn32el/_numpyconfig.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/mipsarchn32el/_numpyconfig.h
rename to poky/meta/recipes-devtools/python-numpy/files/mipsarchn32el/_numpyconfig.h
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/mipsarchn32el/config.h b/poky/meta/recipes-devtools/python-numpy/files/mipsarchn32el/config.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/mipsarchn32el/config.h
rename to poky/meta/recipes-devtools/python-numpy/files/mipsarchn32el/config.h
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/mipsarchn64eb/_numpyconfig.h b/poky/meta/recipes-devtools/python-numpy/files/mipsarchn64eb/_numpyconfig.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/mipsarchn64eb/_numpyconfig.h
rename to poky/meta/recipes-devtools/python-numpy/files/mipsarchn64eb/_numpyconfig.h
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/mipsarchn64eb/config.h b/poky/meta/recipes-devtools/python-numpy/files/mipsarchn64eb/config.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/mipsarchn64eb/config.h
rename to poky/meta/recipes-devtools/python-numpy/files/mipsarchn64eb/config.h
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/mipsarchn64el/_numpyconfig.h b/poky/meta/recipes-devtools/python-numpy/files/mipsarchn64el/_numpyconfig.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/mipsarchn64el/_numpyconfig.h
rename to poky/meta/recipes-devtools/python-numpy/files/mipsarchn64el/_numpyconfig.h
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/mipsarchn64el/config.h b/poky/meta/recipes-devtools/python-numpy/files/mipsarchn64el/config.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/mipsarchn64el/config.h
rename to poky/meta/recipes-devtools/python-numpy/files/mipsarchn64el/config.h
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/mipsarcho32eb/_numpyconfig.h b/poky/meta/recipes-devtools/python-numpy/files/mipsarcho32eb/_numpyconfig.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/mipsarcho32eb/_numpyconfig.h
rename to poky/meta/recipes-devtools/python-numpy/files/mipsarcho32eb/_numpyconfig.h
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/mipsarcho32eb/config.h b/poky/meta/recipes-devtools/python-numpy/files/mipsarcho32eb/config.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/mipsarcho32eb/config.h
rename to poky/meta/recipes-devtools/python-numpy/files/mipsarcho32eb/config.h
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/mipsarcho32el/config.h b/poky/meta/recipes-devtools/python-numpy/files/mipsarcho32el/config.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/mipsarcho32el/config.h
rename to poky/meta/recipes-devtools/python-numpy/files/mipsarcho32el/config.h
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/mipsarcho32el/numpyconfig.h b/poky/meta/recipes-devtools/python-numpy/files/mipsarcho32el/numpyconfig.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/mipsarcho32el/numpyconfig.h
rename to poky/meta/recipes-devtools/python-numpy/files/mipsarcho32el/numpyconfig.h
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/powerpc/_numpyconfig.h b/poky/meta/recipes-devtools/python-numpy/files/powerpc/_numpyconfig.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/powerpc/_numpyconfig.h
rename to poky/meta/recipes-devtools/python-numpy/files/powerpc/_numpyconfig.h
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/powerpc/config.h b/poky/meta/recipes-devtools/python-numpy/files/powerpc/config.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/powerpc/config.h
rename to poky/meta/recipes-devtools/python-numpy/files/powerpc/config.h
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/powerpc64/_numpyconfig.h b/poky/meta/recipes-devtools/python-numpy/files/powerpc64/_numpyconfig.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/powerpc64/_numpyconfig.h
rename to poky/meta/recipes-devtools/python-numpy/files/powerpc64/_numpyconfig.h
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/powerpc64/config.h b/poky/meta/recipes-devtools/python-numpy/files/powerpc64/config.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/powerpc64/config.h
rename to poky/meta/recipes-devtools/python-numpy/files/powerpc64/config.h
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/riscv64/_numpyconfig.h b/poky/meta/recipes-devtools/python-numpy/files/riscv64/_numpyconfig.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/riscv64/_numpyconfig.h
rename to poky/meta/recipes-devtools/python-numpy/files/riscv64/_numpyconfig.h
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/riscv64/config.h b/poky/meta/recipes-devtools/python-numpy/files/riscv64/config.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/riscv64/config.h
rename to poky/meta/recipes-devtools/python-numpy/files/riscv64/config.h
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/x86-64/_numpyconfig.h b/poky/meta/recipes-devtools/python-numpy/files/x86-64/_numpyconfig.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/x86-64/_numpyconfig.h
rename to poky/meta/recipes-devtools/python-numpy/files/x86-64/_numpyconfig.h
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/x86-64/config.h b/poky/meta/recipes-devtools/python-numpy/files/x86-64/config.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/x86-64/config.h
rename to poky/meta/recipes-devtools/python-numpy/files/x86-64/config.h
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/x86/config.h b/poky/meta/recipes-devtools/python-numpy/files/x86/config.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/x86/config.h
rename to poky/meta/recipes-devtools/python-numpy/files/x86/config.h
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/x86/numpyconfig.h b/poky/meta/recipes-devtools/python-numpy/files/x86/numpyconfig.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python-numpy/files/x86/numpyconfig.h
rename to poky/meta/recipes-devtools/python-numpy/files/x86/numpyconfig.h
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python-numpy/python-numpy.inc b/poky/meta/recipes-devtools/python-numpy/python-numpy.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python-numpy/python-numpy.inc
rename to poky/meta/recipes-devtools/python-numpy/python-numpy.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python-numpy/python-numpy_1.14.2.bb b/poky/meta/recipes-devtools/python-numpy/python-numpy_1.14.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python-numpy/python-numpy_1.14.2.bb
rename to poky/meta/recipes-devtools/python-numpy/python-numpy_1.14.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python-numpy/python3-numpy_1.14.2.bb b/poky/meta/recipes-devtools/python-numpy/python3-numpy_1.14.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python-numpy/python3-numpy_1.14.2.bb
rename to poky/meta/recipes-devtools/python-numpy/python3-numpy_1.14.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python-async.inc b/poky/meta/recipes-devtools/python/python-async.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python-async.inc
rename to poky/meta/recipes-devtools/python/python-async.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python-git.inc b/poky/meta/recipes-devtools/python/python-git.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python-git.inc
rename to poky/meta/recipes-devtools/python/python-git.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python-gitdb.inc b/poky/meta/recipes-devtools/python/python-gitdb.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python-gitdb.inc
rename to poky/meta/recipes-devtools/python/python-gitdb.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python-mako.inc b/poky/meta/recipes-devtools/python/python-mako.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python-mako.inc
rename to poky/meta/recipes-devtools/python/python-mako.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python-native/10-distutils-fix-swig-parameter.patch b/poky/meta/recipes-devtools/python/python-native/10-distutils-fix-swig-parameter.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python-native/10-distutils-fix-swig-parameter.patch
rename to poky/meta/recipes-devtools/python/python-native/10-distutils-fix-swig-parameter.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python-native/11-distutils-never-modify-shebang-line.patch b/poky/meta/recipes-devtools/python/python-native/11-distutils-never-modify-shebang-line.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python-native/11-distutils-never-modify-shebang-line.patch
rename to poky/meta/recipes-devtools/python/python-native/11-distutils-never-modify-shebang-line.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python-native/debug.patch b/poky/meta/recipes-devtools/python/python-native/debug.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python-native/debug.patch
rename to poky/meta/recipes-devtools/python/python-native/debug.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python-native/multilib.patch b/poky/meta/recipes-devtools/python/python-native/multilib.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python-native/multilib.patch
rename to poky/meta/recipes-devtools/python/python-native/multilib.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python-native/nohostlibs.patch b/poky/meta/recipes-devtools/python/python-native/nohostlibs.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python-native/nohostlibs.patch
rename to poky/meta/recipes-devtools/python/python-native/nohostlibs.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python-native/revert_use_of_sysconfigdata.patch b/poky/meta/recipes-devtools/python/python-native/revert_use_of_sysconfigdata.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python-native/revert_use_of_sysconfigdata.patch
rename to poky/meta/recipes-devtools/python/python-native/revert_use_of_sysconfigdata.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python-native/unixccompiler.patch b/poky/meta/recipes-devtools/python/python-native/unixccompiler.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python-native/unixccompiler.patch
rename to poky/meta/recipes-devtools/python/python-native/unixccompiler.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python-native_2.7.14.bb b/poky/meta/recipes-devtools/python/python-native_2.7.14.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python-native_2.7.14.bb
rename to poky/meta/recipes-devtools/python/python-native_2.7.14.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python-nose.inc b/poky/meta/recipes-devtools/python/python-nose.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python-nose.inc
rename to poky/meta/recipes-devtools/python/python-nose.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python-nose_1.3.7.bb b/poky/meta/recipes-devtools/python/python-nose_1.3.7.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python-nose_1.3.7.bb
rename to poky/meta/recipes-devtools/python/python-nose_1.3.7.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python-scons-native_3.0.1.bb b/poky/meta/recipes-devtools/python/python-scons-native_3.0.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python-scons-native_3.0.1.bb
rename to poky/meta/recipes-devtools/python/python-scons-native_3.0.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python-scons_3.0.1.bb b/poky/meta/recipes-devtools/python/python-scons_3.0.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python-scons_3.0.1.bb
rename to poky/meta/recipes-devtools/python/python-scons_3.0.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python-setuptools.inc b/poky/meta/recipes-devtools/python/python-setuptools.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python-setuptools.inc
rename to poky/meta/recipes-devtools/python/python-setuptools.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python-setuptools_39.0.0.bb b/poky/meta/recipes-devtools/python/python-setuptools_39.0.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python-setuptools_39.0.0.bb
rename to poky/meta/recipes-devtools/python/python-setuptools_39.0.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python-six.inc b/poky/meta/recipes-devtools/python/python-six.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python-six.inc
rename to poky/meta/recipes-devtools/python/python-six.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python-smmap.inc b/poky/meta/recipes-devtools/python/python-smmap.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python-smmap.inc
rename to poky/meta/recipes-devtools/python/python-smmap.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python.inc b/poky/meta/recipes-devtools/python/python.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python.inc
rename to poky/meta/recipes-devtools/python/python.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python/0001-distutils-set-the-prefix-to-be-inside-staging-direct.patch b/poky/meta/recipes-devtools/python/python/0001-distutils-set-the-prefix-to-be-inside-staging-direct.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python/0001-distutils-set-the-prefix-to-be-inside-staging-direct.patch
rename to poky/meta/recipes-devtools/python/python/0001-distutils-set-the-prefix-to-be-inside-staging-direct.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch b/poky/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch
rename to poky/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python/03-fix-tkinter-detection.patch b/poky/meta/recipes-devtools/python/python/03-fix-tkinter-detection.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python/03-fix-tkinter-detection.patch
rename to poky/meta/recipes-devtools/python/python/03-fix-tkinter-detection.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python/05-enable-ctypes-cross-build.patch b/poky/meta/recipes-devtools/python/python/05-enable-ctypes-cross-build.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python/05-enable-ctypes-cross-build.patch
rename to poky/meta/recipes-devtools/python/python/05-enable-ctypes-cross-build.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python/06-avoid_usr_lib_termcap_path_in_linking.patch b/poky/meta/recipes-devtools/python/python/06-avoid_usr_lib_termcap_path_in_linking.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python/06-avoid_usr_lib_termcap_path_in_linking.patch
rename to poky/meta/recipes-devtools/python/python/06-avoid_usr_lib_termcap_path_in_linking.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python/add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch b/poky/meta/recipes-devtools/python/python/add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python/add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch
rename to poky/meta/recipes-devtools/python/python/add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python/add-md5module-support.patch b/poky/meta/recipes-devtools/python/python/add-md5module-support.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python/add-md5module-support.patch
rename to poky/meta/recipes-devtools/python/python/add-md5module-support.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch b/poky/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch
rename to poky/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python/avoid_warning_for_sunos_specific_module.patch b/poky/meta/recipes-devtools/python/python/avoid_warning_for_sunos_specific_module.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python/avoid_warning_for_sunos_specific_module.patch
rename to poky/meta/recipes-devtools/python/python/avoid_warning_for_sunos_specific_module.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python/builddir.patch b/poky/meta/recipes-devtools/python/python/builddir.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python/builddir.patch
rename to poky/meta/recipes-devtools/python/python/builddir.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python/cgi_py.patch b/poky/meta/recipes-devtools/python/python/cgi_py.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python/cgi_py.patch
rename to poky/meta/recipes-devtools/python/python/cgi_py.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python/check-if-target-is-64b-not-host.patch b/poky/meta/recipes-devtools/python/python/check-if-target-is-64b-not-host.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python/check-if-target-is-64b-not-host.patch
rename to poky/meta/recipes-devtools/python/python/check-if-target-is-64b-not-host.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python/create_manifest2.py b/poky/meta/recipes-devtools/python/python/create_manifest2.py
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python/create_manifest2.py
rename to poky/meta/recipes-devtools/python/python/create_manifest2.py
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python/fix-gc-alignment.patch b/poky/meta/recipes-devtools/python/python/fix-gc-alignment.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python/fix-gc-alignment.patch
rename to poky/meta/recipes-devtools/python/python/fix-gc-alignment.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python/fix-makefile-for-ptest.patch b/poky/meta/recipes-devtools/python/python/fix-makefile-for-ptest.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python/fix-makefile-for-ptest.patch
rename to poky/meta/recipes-devtools/python/python/fix-makefile-for-ptest.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch b/poky/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch
rename to poky/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python/get_module_deps2.py b/poky/meta/recipes-devtools/python/python/get_module_deps2.py
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python/get_module_deps2.py
rename to poky/meta/recipes-devtools/python/python/get_module_deps2.py
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python/host_include_contamination.patch b/poky/meta/recipes-devtools/python/python/host_include_contamination.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python/host_include_contamination.patch
rename to poky/meta/recipes-devtools/python/python/host_include_contamination.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python/multilib.patch b/poky/meta/recipes-devtools/python/python/multilib.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python/multilib.patch
rename to poky/meta/recipes-devtools/python/python/multilib.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python/parallel-makeinst-create-bindir.patch b/poky/meta/recipes-devtools/python/python/parallel-makeinst-create-bindir.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python/parallel-makeinst-create-bindir.patch
rename to poky/meta/recipes-devtools/python/python/parallel-makeinst-create-bindir.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python/pass-missing-libraries-to-Extension-for-mul.patch b/poky/meta/recipes-devtools/python/python/pass-missing-libraries-to-Extension-for-mul.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python/pass-missing-libraries-to-Extension-for-mul.patch
rename to poky/meta/recipes-devtools/python/python/pass-missing-libraries-to-Extension-for-mul.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python/python-2.7.3-remove-bsdb-rpath.patch b/poky/meta/recipes-devtools/python/python/python-2.7.3-remove-bsdb-rpath.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python/python-2.7.3-remove-bsdb-rpath.patch
rename to poky/meta/recipes-devtools/python/python/python-2.7.3-remove-bsdb-rpath.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python/python2-manifest.json b/poky/meta/recipes-devtools/python/python/python2-manifest.json
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python/python2-manifest.json
rename to poky/meta/recipes-devtools/python/python/python2-manifest.json
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python/run-ptest b/poky/meta/recipes-devtools/python/python/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python/run-ptest
rename to poky/meta/recipes-devtools/python/python/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python/search_db_h_in_inc_dirs_and_avoid_warning.patch b/poky/meta/recipes-devtools/python/python/search_db_h_in_inc_dirs_and_avoid_warning.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python/search_db_h_in_inc_dirs_and_avoid_warning.patch
rename to poky/meta/recipes-devtools/python/python/search_db_h_in_inc_dirs_and_avoid_warning.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python/setup_py_skip_cross_import_check.patch b/poky/meta/recipes-devtools/python/python/setup_py_skip_cross_import_check.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python/setup_py_skip_cross_import_check.patch
rename to poky/meta/recipes-devtools/python/python/setup_py_skip_cross_import_check.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python/setuptweaks.patch b/poky/meta/recipes-devtools/python/python/setuptweaks.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python/setuptweaks.patch
rename to poky/meta/recipes-devtools/python/python/setuptweaks.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python/sitecustomize.py b/poky/meta/recipes-devtools/python/python/sitecustomize.py
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python/sitecustomize.py
rename to poky/meta/recipes-devtools/python/python/sitecustomize.py
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python/support_SOURCE_DATE_EPOCH_in_py_compile_2.7.patch b/poky/meta/recipes-devtools/python/python/support_SOURCE_DATE_EPOCH_in_py_compile_2.7.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python/support_SOURCE_DATE_EPOCH_in_py_compile_2.7.patch
rename to poky/meta/recipes-devtools/python/python/support_SOURCE_DATE_EPOCH_in_py_compile_2.7.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python/use_sysroot_ncurses_instead_of_host.patch b/poky/meta/recipes-devtools/python/python/use_sysroot_ncurses_instead_of_host.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python/use_sysroot_ncurses_instead_of_host.patch
rename to poky/meta/recipes-devtools/python/python/use_sysroot_ncurses_instead_of_host.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3-async_0.6.2.bb b/poky/meta/recipes-devtools/python/python3-async_0.6.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3-async_0.6.2.bb
rename to poky/meta/recipes-devtools/python/python3-async_0.6.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3-dbus_1.2.6.bb b/poky/meta/recipes-devtools/python/python3-dbus_1.2.6.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3-dbus_1.2.6.bb
rename to poky/meta/recipes-devtools/python/python3-dbus_1.2.6.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3-docutils_0.14.bb b/poky/meta/recipes-devtools/python/python3-docutils_0.14.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3-docutils_0.14.bb
rename to poky/meta/recipes-devtools/python/python3-docutils_0.14.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3-git_2.1.8.bb b/poky/meta/recipes-devtools/python/python3-git_2.1.8.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3-git_2.1.8.bb
rename to poky/meta/recipes-devtools/python/python3-git_2.1.8.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3-gitdb_2.0.3.bb b/poky/meta/recipes-devtools/python/python3-gitdb_2.0.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3-gitdb_2.0.3.bb
rename to poky/meta/recipes-devtools/python/python3-gitdb_2.0.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3-iniparse/0001-Add-python-3-compatibility.patch b/poky/meta/recipes-devtools/python/python3-iniparse/0001-Add-python-3-compatibility.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3-iniparse/0001-Add-python-3-compatibility.patch
rename to poky/meta/recipes-devtools/python/python3-iniparse/0001-Add-python-3-compatibility.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3-iniparse_0.4.bb b/poky/meta/recipes-devtools/python/python3-iniparse_0.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3-iniparse_0.4.bb
rename to poky/meta/recipes-devtools/python/python3-iniparse_0.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3-mako_1.0.7.bb b/poky/meta/recipes-devtools/python/python3-mako_1.0.7.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3-mako_1.0.7.bb
rename to poky/meta/recipes-devtools/python/python3-mako_1.0.7.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3-native_3.5.5.bb b/poky/meta/recipes-devtools/python/python3-native_3.5.5.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3-native_3.5.5.bb
rename to poky/meta/recipes-devtools/python/python3-native_3.5.5.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3-nose_1.3.7.bb b/poky/meta/recipes-devtools/python/python3-nose_1.3.7.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3-nose_1.3.7.bb
rename to poky/meta/recipes-devtools/python/python3-nose_1.3.7.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3-pip_9.0.2.bb b/poky/meta/recipes-devtools/python/python3-pip_9.0.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3-pip_9.0.2.bb
rename to poky/meta/recipes-devtools/python/python3-pip_9.0.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3-pycairo_1.15.6.bb b/poky/meta/recipes-devtools/python/python3-pycairo_1.15.6.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3-pycairo_1.15.6.bb
rename to poky/meta/recipes-devtools/python/python3-pycairo_1.15.6.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3-pygobject_3.28.1.bb b/poky/meta/recipes-devtools/python/python3-pygobject_3.28.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3-pygobject_3.28.1.bb
rename to poky/meta/recipes-devtools/python/python3-pygobject_3.28.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3-setuptools_39.0.0.bb b/poky/meta/recipes-devtools/python/python3-setuptools_39.0.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3-setuptools_39.0.0.bb
rename to poky/meta/recipes-devtools/python/python3-setuptools_39.0.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3-six_1.11.0.bb b/poky/meta/recipes-devtools/python/python3-six_1.11.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3-six_1.11.0.bb
rename to poky/meta/recipes-devtools/python/python3-six_1.11.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3-smmap_0.9.0.bb b/poky/meta/recipes-devtools/python/python3-smmap_0.9.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3-smmap_0.9.0.bb
rename to poky/meta/recipes-devtools/python/python3-smmap_0.9.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3/0001-Do-not-use-the-shell-version-of-python-config-that-w.patch b/poky/meta/recipes-devtools/python/python3/0001-Do-not-use-the-shell-version-of-python-config-that-w.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3/0001-Do-not-use-the-shell-version-of-python-config-that-w.patch
rename to poky/meta/recipes-devtools/python/python3/0001-Do-not-use-the-shell-version-of-python-config-that-w.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3/0001-Issue-21272-Use-_sysconfigdata.py-to-initialize-dist.patch b/poky/meta/recipes-devtools/python/python3/0001-Issue-21272-Use-_sysconfigdata.py-to-initialize-dist.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3/0001-Issue-21272-Use-_sysconfigdata.py-to-initialize-dist.patch
rename to poky/meta/recipes-devtools/python/python3/0001-Issue-21272-Use-_sysconfigdata.py-to-initialize-dist.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3/0001-cross-compile-support.patch b/poky/meta/recipes-devtools/python/python3/0001-cross-compile-support.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3/0001-cross-compile-support.patch
rename to poky/meta/recipes-devtools/python/python3/0001-cross-compile-support.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3/0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch b/poky/meta/recipes-devtools/python/python3/0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3/0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch
rename to poky/meta/recipes-devtools/python/python3/0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3/03-fix-tkinter-detection.patch b/poky/meta/recipes-devtools/python/python3/03-fix-tkinter-detection.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3/03-fix-tkinter-detection.patch
rename to poky/meta/recipes-devtools/python/python3/03-fix-tkinter-detection.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3/030-fixup-include-dirs.patch b/poky/meta/recipes-devtools/python/python3/030-fixup-include-dirs.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3/030-fixup-include-dirs.patch
rename to poky/meta/recipes-devtools/python/python3/030-fixup-include-dirs.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3/070-dont-clean-ipkg-install.patch b/poky/meta/recipes-devtools/python/python3/070-dont-clean-ipkg-install.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3/070-dont-clean-ipkg-install.patch
rename to poky/meta/recipes-devtools/python/python3/070-dont-clean-ipkg-install.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3/080-distutils-dont_adjust_files.patch b/poky/meta/recipes-devtools/python/python3/080-distutils-dont_adjust_files.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3/080-distutils-dont_adjust_files.patch
rename to poky/meta/recipes-devtools/python/python3/080-distutils-dont_adjust_files.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch b/poky/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
rename to poky/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3/130-readline-setup.patch b/poky/meta/recipes-devtools/python/python3/130-readline-setup.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3/130-readline-setup.patch
rename to poky/meta/recipes-devtools/python/python3/130-readline-setup.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3/150-fix-setupterm.patch b/poky/meta/recipes-devtools/python/python3/150-fix-setupterm.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3/150-fix-setupterm.patch
rename to poky/meta/recipes-devtools/python/python3/150-fix-setupterm.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3/avoid-ncursesw-include-path.patch b/poky/meta/recipes-devtools/python/python3/avoid-ncursesw-include-path.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3/avoid-ncursesw-include-path.patch
rename to poky/meta/recipes-devtools/python/python3/avoid-ncursesw-include-path.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patch b/poky/meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patch
rename to poky/meta/recipes-devtools/python/python3/avoid_warning_about_tkinter.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3/cgi_py.patch b/poky/meta/recipes-devtools/python/python3/cgi_py.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3/cgi_py.patch
rename to poky/meta/recipes-devtools/python/python3/cgi_py.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3/configure.ac-fix-LIBPL.patch b/poky/meta/recipes-devtools/python/python3/configure.ac-fix-LIBPL.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3/configure.ac-fix-LIBPL.patch
rename to poky/meta/recipes-devtools/python/python3/configure.ac-fix-LIBPL.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3/create_manifest3.py b/poky/meta/recipes-devtools/python/python3/create_manifest3.py
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3/create_manifest3.py
rename to poky/meta/recipes-devtools/python/python3/create_manifest3.py
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3/fix_for_using_different_libdir.patch b/poky/meta/recipes-devtools/python/python3/fix_for_using_different_libdir.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3/fix_for_using_different_libdir.patch
rename to poky/meta/recipes-devtools/python/python3/fix_for_using_different_libdir.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3/get_module_deps3.py b/poky/meta/recipes-devtools/python/python3/get_module_deps3.py
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3/get_module_deps3.py
rename to poky/meta/recipes-devtools/python/python3/get_module_deps3.py
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3/host_include_contamination.patch b/poky/meta/recipes-devtools/python/python3/host_include_contamination.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3/host_include_contamination.patch
rename to poky/meta/recipes-devtools/python/python3/host_include_contamination.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3/pass-missing-libraries-to-Extension-for-mul.patch b/poky/meta/recipes-devtools/python/python3/pass-missing-libraries-to-Extension-for-mul.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3/pass-missing-libraries-to-Extension-for-mul.patch
rename to poky/meta/recipes-devtools/python/python3/pass-missing-libraries-to-Extension-for-mul.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3/python-3.3-multilib.patch b/poky/meta/recipes-devtools/python/python3/python-3.3-multilib.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3/python-3.3-multilib.patch
rename to poky/meta/recipes-devtools/python/python3/python-3.3-multilib.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3/python-config.patch b/poky/meta/recipes-devtools/python/python3/python-config.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3/python-config.patch
rename to poky/meta/recipes-devtools/python/python3/python-config.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3/python3-manifest.json b/poky/meta/recipes-devtools/python/python3/python3-manifest.json
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3/python3-manifest.json
rename to poky/meta/recipes-devtools/python/python3/python3-manifest.json
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3/python3-use-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch b/poky/meta/recipes-devtools/python/python3/python3-use-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3/python3-use-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch
rename to poky/meta/recipes-devtools/python/python3/python3-use-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3/regen-all.patch b/poky/meta/recipes-devtools/python/python3/regen-all.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3/regen-all.patch
rename to poky/meta/recipes-devtools/python/python3/regen-all.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3/setup.py-check-cross_compiling-when-get-FLAGS.patch b/poky/meta/recipes-devtools/python/python3/setup.py-check-cross_compiling-when-get-FLAGS.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3/setup.py-check-cross_compiling-when-get-FLAGS.patch
rename to poky/meta/recipes-devtools/python/python3/setup.py-check-cross_compiling-when-get-FLAGS.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3/setuptweaks.patch b/poky/meta/recipes-devtools/python/python3/setuptweaks.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3/setuptweaks.patch
rename to poky/meta/recipes-devtools/python/python3/setuptweaks.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3/shutil-follow-symlink-fix.patch b/poky/meta/recipes-devtools/python/python3/shutil-follow-symlink-fix.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3/shutil-follow-symlink-fix.patch
rename to poky/meta/recipes-devtools/python/python3/shutil-follow-symlink-fix.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3/sitecustomize.py b/poky/meta/recipes-devtools/python/python3/sitecustomize.py
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3/sitecustomize.py
rename to poky/meta/recipes-devtools/python/python3/sitecustomize.py
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3/support_SOURCE_DATE_EPOCH_in_py_compile.patch b/poky/meta/recipes-devtools/python/python3/support_SOURCE_DATE_EPOCH_in_py_compile.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3/support_SOURCE_DATE_EPOCH_in_py_compile.patch
rename to poky/meta/recipes-devtools/python/python3/support_SOURCE_DATE_EPOCH_in_py_compile.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3/sysconfig.py-add-_PYTHON_PROJECT_SRC.patch b/poky/meta/recipes-devtools/python/python3/sysconfig.py-add-_PYTHON_PROJECT_SRC.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3/sysconfig.py-add-_PYTHON_PROJECT_SRC.patch
rename to poky/meta/recipes-devtools/python/python3/sysconfig.py-add-_PYTHON_PROJECT_SRC.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3/sysroot-include-headers.patch b/poky/meta/recipes-devtools/python/python3/sysroot-include-headers.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3/sysroot-include-headers.patch
rename to poky/meta/recipes-devtools/python/python3/sysroot-include-headers.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3/tweak-MULTIARCH-for-powerpc-linux-gnuspe.patch b/poky/meta/recipes-devtools/python/python3/tweak-MULTIARCH-for-powerpc-linux-gnuspe.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3/tweak-MULTIARCH-for-powerpc-linux-gnuspe.patch
rename to poky/meta/recipes-devtools/python/python3/tweak-MULTIARCH-for-powerpc-linux-gnuspe.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3/unixccompiler.patch b/poky/meta/recipes-devtools/python/python3/unixccompiler.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3/unixccompiler.patch
rename to poky/meta/recipes-devtools/python/python3/unixccompiler.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python3_3.5.5.bb b/poky/meta/recipes-devtools/python/python3_3.5.5.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python3_3.5.5.bb
rename to poky/meta/recipes-devtools/python/python3_3.5.5.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/python/python_2.7.14.bb b/poky/meta/recipes-devtools/python/python_2.7.14.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/python/python_2.7.14.bb
rename to poky/meta/recipes-devtools/python/python_2.7.14.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb b/poky/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb
rename to poky/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb b/poky/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb
rename to poky/meta/recipes-devtools/qemu/qemu-helper-native_1.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu-helper/tunctl.c b/poky/meta/recipes-devtools/qemu/qemu-helper/tunctl.c
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu-helper/tunctl.c
rename to poky/meta/recipes-devtools/qemu/qemu-helper/tunctl.c
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu-targets.inc b/poky/meta/recipes-devtools/qemu/qemu-targets.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu-targets.inc
rename to poky/meta/recipes-devtools/qemu/qemu-targets.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu.inc b/poky/meta/recipes-devtools/qemu/qemu.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu.inc
rename to poky/meta/recipes-devtools/qemu/qemu.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu/0001-arm-translate-a64-treat-DISAS_UPDATE-as-variant-of-D.patch b/poky/meta/recipes-devtools/qemu/qemu/0001-arm-translate-a64-treat-DISAS_UPDATE-as-variant-of-D.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu/0001-arm-translate-a64-treat-DISAS_UPDATE-as-variant-of-D.patch
rename to poky/meta/recipes-devtools/qemu/qemu/0001-arm-translate-a64-treat-DISAS_UPDATE-as-variant-of-D.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu/add-ptest-in-makefile-v10.patch b/poky/meta/recipes-devtools/qemu/qemu/add-ptest-in-makefile-v10.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu/add-ptest-in-makefile-v10.patch
rename to poky/meta/recipes-devtools/qemu/qemu/add-ptest-in-makefile-v10.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu/apic-fixup-fallthrough-to-PIC.patch b/poky/meta/recipes-devtools/qemu/qemu/apic-fixup-fallthrough-to-PIC.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu/apic-fixup-fallthrough-to-PIC.patch
rename to poky/meta/recipes-devtools/qemu/qemu/apic-fixup-fallthrough-to-PIC.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu/chardev-connect-socket-to-a-spawned-command.patch b/poky/meta/recipes-devtools/qemu/qemu/chardev-connect-socket-to-a-spawned-command.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu/chardev-connect-socket-to-a-spawned-command.patch
rename to poky/meta/recipes-devtools/qemu/qemu/chardev-connect-socket-to-a-spawned-command.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu/check-PS2Queue-pointers-in-post_load-routine.patch b/poky/meta/recipes-devtools/qemu/qemu/check-PS2Queue-pointers-in-post_load-routine.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu/check-PS2Queue-pointers-in-post_load-routine.patch
rename to poky/meta/recipes-devtools/qemu/qemu/check-PS2Queue-pointers-in-post_load-routine.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu/cpus.c-qemu_cpu_kick_thread_debugging.patch b/poky/meta/recipes-devtools/qemu/qemu/cpus.c-qemu_cpu_kick_thread_debugging.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu/cpus.c-qemu_cpu_kick_thread_debugging.patch
rename to poky/meta/recipes-devtools/qemu/qemu/cpus.c-qemu_cpu_kick_thread_debugging.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu/disable-grabs.patch b/poky/meta/recipes-devtools/qemu/qemu/disable-grabs.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu/disable-grabs.patch
rename to poky/meta/recipes-devtools/qemu/qemu/disable-grabs.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu/fix-libcap-header-issue-on-some-distro.patch b/poky/meta/recipes-devtools/qemu/qemu/fix-libcap-header-issue-on-some-distro.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu/fix-libcap-header-issue-on-some-distro.patch
rename to poky/meta/recipes-devtools/qemu/qemu/fix-libcap-header-issue-on-some-distro.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu/linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch b/poky/meta/recipes-devtools/qemu/qemu/linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu/linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch
rename to poky/meta/recipes-devtools/qemu/qemu/linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu/memfd.patch b/poky/meta/recipes-devtools/qemu/qemu/memfd.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu/memfd.patch
rename to poky/meta/recipes-devtools/qemu/qemu/memfd.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu/no-valgrind.patch b/poky/meta/recipes-devtools/qemu/qemu/no-valgrind.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu/no-valgrind.patch
rename to poky/meta/recipes-devtools/qemu/qemu/no-valgrind.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu/pathlimit.patch b/poky/meta/recipes-devtools/qemu/qemu/pathlimit.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu/pathlimit.patch
rename to poky/meta/recipes-devtools/qemu/qemu/pathlimit.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu/powerpc_rom.bin b/poky/meta/recipes-devtools/qemu/qemu/powerpc_rom.bin
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu/powerpc_rom.bin
rename to poky/meta/recipes-devtools/qemu/qemu/powerpc_rom.bin
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu/qemu-2.5.0-cflags.patch b/poky/meta/recipes-devtools/qemu/qemu/qemu-2.5.0-cflags.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu/qemu-2.5.0-cflags.patch
rename to poky/meta/recipes-devtools/qemu/qemu/qemu-2.5.0-cflags.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu/qemu-enlarge-env-entry-size.patch b/poky/meta/recipes-devtools/qemu/qemu/qemu-enlarge-env-entry-size.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu/qemu-enlarge-env-entry-size.patch
rename to poky/meta/recipes-devtools/qemu/qemu/qemu-enlarge-env-entry-size.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu/run-ptest b/poky/meta/recipes-devtools/qemu/qemu/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu/run-ptest
rename to poky/meta/recipes-devtools/qemu/qemu/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu/wacom.patch b/poky/meta/recipes-devtools/qemu/qemu/wacom.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu/wacom.patch
rename to poky/meta/recipes-devtools/qemu/qemu/wacom.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu_2.11.1.bb b/poky/meta/recipes-devtools/qemu/qemu_2.11.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/qemu/qemu_2.11.1.bb
rename to poky/meta/recipes-devtools/qemu/qemu_2.11.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/qemu/qemuwrapper-cross_1.0.bb b/poky/meta/recipes-devtools/qemu/qemuwrapper-cross_1.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/qemu/qemuwrapper-cross_1.0.bb
rename to poky/meta/recipes-devtools/qemu/qemuwrapper-cross_1.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/quilt/quilt-native.inc b/poky/meta/recipes-devtools/quilt/quilt-native.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/quilt/quilt-native.inc
rename to poky/meta/recipes-devtools/quilt/quilt-native.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/quilt/quilt-native_0.65.bb b/poky/meta/recipes-devtools/quilt/quilt-native_0.65.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/quilt/quilt-native_0.65.bb
rename to poky/meta/recipes-devtools/quilt/quilt-native_0.65.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/quilt/quilt.inc b/poky/meta/recipes-devtools/quilt/quilt.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/quilt/quilt.inc
rename to poky/meta/recipes-devtools/quilt/quilt.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/quilt/quilt/0001-tests-Allow-different-output-from-mv.patch b/poky/meta/recipes-devtools/quilt/quilt/0001-tests-Allow-different-output-from-mv.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/quilt/quilt/0001-tests-Allow-different-output-from-mv.patch
rename to poky/meta/recipes-devtools/quilt/quilt/0001-tests-Allow-different-output-from-mv.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/quilt/quilt/Makefile b/poky/meta/recipes-devtools/quilt/quilt/Makefile
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/quilt/quilt/Makefile
rename to poky/meta/recipes-devtools/quilt/quilt/Makefile
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch b/poky/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch
rename to poky/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/quilt/quilt/run-ptest b/poky/meta/recipes-devtools/quilt/quilt/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/quilt/quilt/run-ptest
rename to poky/meta/recipes-devtools/quilt/quilt/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/quilt/quilt/test.sh b/poky/meta/recipes-devtools/quilt/quilt/test.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/quilt/quilt/test.sh
rename to poky/meta/recipes-devtools/quilt/quilt/test.sh
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/quilt/quilt_0.65.bb b/poky/meta/recipes-devtools/quilt/quilt_0.65.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/quilt/quilt_0.65.bb
rename to poky/meta/recipes-devtools/quilt/quilt_0.65.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch b/poky/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch
rename to poky/meta/recipes-devtools/rpm/files/0001-Add-a-color-setting-for-mips64_n32-binaries.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch b/poky/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch
rename to poky/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch b/poky/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch
rename to poky/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch b/poky/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch
rename to poky/meta/recipes-devtools/rpm/files/0001-Do-not-read-config-files-from-HOME.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch b/poky/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch
rename to poky/meta/recipes-devtools/rpm/files/0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/rpm/files/0001-Factor-out-and-unify-setting-CLOEXEC.patch b/poky/meta/recipes-devtools/rpm/files/0001-Factor-out-and-unify-setting-CLOEXEC.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/rpm/files/0001-Factor-out-and-unify-setting-CLOEXEC.patch
rename to poky/meta/recipes-devtools/rpm/files/0001-Factor-out-and-unify-setting-CLOEXEC.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/rpm/files/0001-Fix-build-with-musl-C-library.patch b/poky/meta/recipes-devtools/rpm/files/0001-Fix-build-with-musl-C-library.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/rpm/files/0001-Fix-build-with-musl-C-library.patch
rename to poky/meta/recipes-devtools/rpm/files/0001-Fix-build-with-musl-C-library.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/rpm/files/0001-Split-binary-package-building-into-a-separate-functi.patch b/poky/meta/recipes-devtools/rpm/files/0001-Split-binary-package-building-into-a-separate-functi.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/rpm/files/0001-Split-binary-package-building-into-a-separate-functi.patch
rename to poky/meta/recipes-devtools/rpm/files/0001-Split-binary-package-building-into-a-separate-functi.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch b/poky/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch
rename to poky/meta/recipes-devtools/rpm/files/0001-When-cross-installing-execute-package-scriptlets-wit.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/rpm/files/0001-configure.ac-add-option-for-dbus.patch b/poky/meta/recipes-devtools/rpm/files/0001-configure.ac-add-option-for-dbus.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/rpm/files/0001-configure.ac-add-option-for-dbus.patch
rename to poky/meta/recipes-devtools/rpm/files/0001-configure.ac-add-option-for-dbus.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch b/poky/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch
rename to poky/meta/recipes-devtools/rpm/files/0001-perl-disable-auto-reqs.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch b/poky/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch
rename to poky/meta/recipes-devtools/rpm/files/0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/rpm/files/0002-Optimize-rpmSetCloseOnExec.patch b/poky/meta/recipes-devtools/rpm/files/0002-Optimize-rpmSetCloseOnExec.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/rpm/files/0002-Optimize-rpmSetCloseOnExec.patch
rename to poky/meta/recipes-devtools/rpm/files/0002-Optimize-rpmSetCloseOnExec.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/rpm/files/0002-Run-binary-package-creation-via-thread-pools.patch b/poky/meta/recipes-devtools/rpm/files/0002-Run-binary-package-creation-via-thread-pools.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/rpm/files/0002-Run-binary-package-creation-via-thread-pools.patch
rename to poky/meta/recipes-devtools/rpm/files/0002-Run-binary-package-creation-via-thread-pools.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/rpm/files/0003-rpmSetCloseOnExec-use-getrlimit.patch b/poky/meta/recipes-devtools/rpm/files/0003-rpmSetCloseOnExec-use-getrlimit.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/rpm/files/0003-rpmSetCloseOnExec-use-getrlimit.patch
rename to poky/meta/recipes-devtools/rpm/files/0003-rpmSetCloseOnExec-use-getrlimit.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/rpm/files/0003-rpmstrpool.c-make-operations-over-string-pools-threa.patch b/poky/meta/recipes-devtools/rpm/files/0003-rpmstrpool.c-make-operations-over-string-pools-threa.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/rpm/files/0003-rpmstrpool.c-make-operations-over-string-pools-threa.patch
rename to poky/meta/recipes-devtools/rpm/files/0003-rpmstrpool.c-make-operations-over-string-pools-threa.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/rpm/files/0004-build-pack.c-remove-static-local-variables-from-buil.patch b/poky/meta/recipes-devtools/rpm/files/0004-build-pack.c-remove-static-local-variables-from-buil.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/rpm/files/0004-build-pack.c-remove-static-local-variables-from-buil.patch
rename to poky/meta/recipes-devtools/rpm/files/0004-build-pack.c-remove-static-local-variables-from-buil.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/rpm/files/0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch b/poky/meta/recipes-devtools/rpm/files/0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/rpm/files/0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch
rename to poky/meta/recipes-devtools/rpm/files/0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/rpm/rpm_4.14.1.bb b/poky/meta/recipes-devtools/rpm/rpm_4.14.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/rpm/rpm_4.14.1.bb
rename to poky/meta/recipes-devtools/rpm/rpm_4.14.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch b/poky/meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch
rename to poky/meta/recipes-devtools/rsync/files/makefile-no-rebuild.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/rsync/files/rsyncd.conf b/poky/meta/recipes-devtools/rsync/files/rsyncd.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/rsync/files/rsyncd.conf
rename to poky/meta/recipes-devtools/rsync/files/rsyncd.conf
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/rsync/rsync.inc b/poky/meta/recipes-devtools/rsync/rsync.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/rsync/rsync.inc
rename to poky/meta/recipes-devtools/rsync/rsync.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/rsync/rsync_3.1.3.bb b/poky/meta/recipes-devtools/rsync/rsync_3.1.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/rsync/rsync_3.1.3.bb
rename to poky/meta/recipes-devtools/rsync/rsync_3.1.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/ruby/ruby.inc b/poky/meta/recipes-devtools/ruby/ruby.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/ruby/ruby.inc
rename to poky/meta/recipes-devtools/ruby/ruby.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch b/poky/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch
rename to poky/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/ruby/ruby/extmk.patch b/poky/meta/recipes-devtools/ruby/ruby/extmk.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/ruby/ruby/extmk.patch
rename to poky/meta/recipes-devtools/ruby/ruby/extmk.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/ruby/ruby/ruby-CVE-2017-9226.patch b/poky/meta/recipes-devtools/ruby/ruby/ruby-CVE-2017-9226.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/ruby/ruby/ruby-CVE-2017-9226.patch
rename to poky/meta/recipes-devtools/ruby/ruby/ruby-CVE-2017-9226.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/ruby/ruby/ruby-CVE-2017-9228.patch b/poky/meta/recipes-devtools/ruby/ruby/ruby-CVE-2017-9228.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/ruby/ruby/ruby-CVE-2017-9228.patch
rename to poky/meta/recipes-devtools/ruby/ruby/ruby-CVE-2017-9228.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/ruby/ruby_2.5.0.bb b/poky/meta/recipes-devtools/ruby/ruby_2.5.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/ruby/ruby_2.5.0.bb
rename to poky/meta/recipes-devtools/ruby/ruby_2.5.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts b/poky/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts
rename to poky/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts.init b/poky/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts.init
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts.init
rename to poky/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts.init
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts.service b/poky/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts.service
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts.service
rename to poky/meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts.service
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb b/poky/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb
rename to poky/meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/squashfs-tools/squashfs-tools/0001-mksquashfs.c-get-inline-functions-work-with-C99.patch b/poky/meta/recipes-devtools/squashfs-tools/squashfs-tools/0001-mksquashfs.c-get-inline-functions-work-with-C99.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/squashfs-tools/squashfs-tools/0001-mksquashfs.c-get-inline-functions-work-with-C99.patch
rename to poky/meta/recipes-devtools/squashfs-tools/squashfs-tools/0001-mksquashfs.c-get-inline-functions-work-with-C99.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/squashfs-tools/squashfs-tools/fix-compat.patch b/poky/meta/recipes-devtools/squashfs-tools/squashfs-tools/fix-compat.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/squashfs-tools/squashfs-tools/fix-compat.patch
rename to poky/meta/recipes-devtools/squashfs-tools/squashfs-tools/fix-compat.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/squashfs-tools/squashfs-tools/squashfs-tools-4.3-sysmacros.patch b/poky/meta/recipes-devtools/squashfs-tools/squashfs-tools/squashfs-tools-4.3-sysmacros.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/squashfs-tools/squashfs-tools/squashfs-tools-4.3-sysmacros.patch
rename to poky/meta/recipes-devtools/squashfs-tools/squashfs-tools/squashfs-tools-4.3-sysmacros.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb b/poky/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
rename to poky/meta/recipes-devtools/squashfs-tools/squashfs-tools_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/strace/strace/0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch b/poky/meta/recipes-devtools/strace/strace/0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/strace/strace/0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch
rename to poky/meta/recipes-devtools/strace/strace/0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch b/poky/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch
rename to poky/meta/recipes-devtools/strace/strace/0001-caps-abbrev.awk-fix-gawk-s-path.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/strace/strace/0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch b/poky/meta/recipes-devtools/strace/strace/0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/strace/strace/0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch
rename to poky/meta/recipes-devtools/strace/strace/0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/strace/strace/Makefile-ptest.patch b/poky/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
rename to poky/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch b/poky/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch
rename to poky/meta/recipes-devtools/strace/strace/disable-git-version-gen.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch b/poky/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch
rename to poky/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch b/poky/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch
rename to poky/meta/recipes-devtools/strace/strace/more-robust-test-for-m32-mx32-compile-support.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/strace/strace/run-ptest b/poky/meta/recipes-devtools/strace/strace/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/strace/strace/run-ptest
rename to poky/meta/recipes-devtools/strace/strace/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/strace/strace/update-gawk-paths.patch b/poky/meta/recipes-devtools/strace/strace/update-gawk-paths.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/strace/strace/update-gawk-paths.patch
rename to poky/meta/recipes-devtools/strace/strace/update-gawk-paths.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/strace/strace_4.20.bb b/poky/meta/recipes-devtools/strace/strace_4.20.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/strace/strace_4.20.bb
rename to poky/meta/recipes-devtools/strace/strace_4.20.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/subversion/subversion/0001-Fix-libtool-name-in-configure.ac.patch b/poky/meta/recipes-devtools/subversion/subversion/0001-Fix-libtool-name-in-configure.ac.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/subversion/subversion/0001-Fix-libtool-name-in-configure.ac.patch
rename to poky/meta/recipes-devtools/subversion/subversion/0001-Fix-libtool-name-in-configure.ac.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/subversion/subversion/disable_macos.patch b/poky/meta/recipes-devtools/subversion/subversion/disable_macos.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/subversion/subversion/disable_macos.patch
rename to poky/meta/recipes-devtools/subversion/subversion/disable_macos.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/subversion/subversion/serf.m4-Regex-modified-to-allow-D-in-paths.patch b/poky/meta/recipes-devtools/subversion/subversion/serf.m4-Regex-modified-to-allow-D-in-paths.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/subversion/subversion/serf.m4-Regex-modified-to-allow-D-in-paths.patch
rename to poky/meta/recipes-devtools/subversion/subversion/serf.m4-Regex-modified-to-allow-D-in-paths.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/subversion/subversion/serfmacro.patch b/poky/meta/recipes-devtools/subversion/subversion/serfmacro.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/subversion/subversion/serfmacro.patch
rename to poky/meta/recipes-devtools/subversion/subversion/serfmacro.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/subversion/subversion_1.9.7.bb b/poky/meta/recipes-devtools/subversion/subversion_1.9.7.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/subversion/subversion_1.9.7.bb
rename to poky/meta/recipes-devtools/subversion/subversion_1.9.7.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/swig/swig.inc b/poky/meta/recipes-devtools/swig/swig.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/swig/swig.inc
rename to poky/meta/recipes-devtools/swig/swig.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/swig/swig/0001-Add-Node-7.x-aka-V8-5.2-support.patch b/poky/meta/recipes-devtools/swig/swig/0001-Add-Node-7.x-aka-V8-5.2-support.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/swig/swig/0001-Add-Node-7.x-aka-V8-5.2-support.patch
rename to poky/meta/recipes-devtools/swig/swig/0001-Add-Node-7.x-aka-V8-5.2-support.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch b/poky/meta/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch
rename to poky/meta/recipes-devtools/swig/swig/0001-Use-proc-self-exe-for-swig-swiglib-on-non-Win32-plat.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch b/poky/meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch
rename to poky/meta/recipes-devtools/swig/swig/0001-configure-use-pkg-config-for-pcre-detection.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/swig/swig_3.0.12.bb b/poky/meta/recipes-devtools/swig/swig_3.0.12.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/swig/swig_3.0.12.bb
rename to poky/meta/recipes-devtools/swig/swig_3.0.12.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0001-linux-syslinux-support-ext2-3-4-device.patch b/poky/meta/recipes-devtools/syslinux/syslinux/0001-linux-syslinux-support-ext2-3-4-device.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0001-linux-syslinux-support-ext2-3-4-device.patch
rename to poky/meta/recipes-devtools/syslinux/syslinux/0001-linux-syslinux-support-ext2-3-4-device.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0002-linux-syslinux-implement-open_ext2_fs.patch b/poky/meta/recipes-devtools/syslinux/syslinux/0002-linux-syslinux-implement-open_ext2_fs.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0002-linux-syslinux-implement-open_ext2_fs.patch
rename to poky/meta/recipes-devtools/syslinux/syslinux/0002-linux-syslinux-implement-open_ext2_fs.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0003-linux-syslinux-implement-install_to_ext2.patch b/poky/meta/recipes-devtools/syslinux/syslinux/0003-linux-syslinux-implement-install_to_ext2.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0003-linux-syslinux-implement-install_to_ext2.patch
rename to poky/meta/recipes-devtools/syslinux/syslinux/0003-linux-syslinux-implement-install_to_ext2.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0004-linux-syslinux-add-ext_file_read-and-ext_file_write.patch b/poky/meta/recipes-devtools/syslinux/syslinux/0004-linux-syslinux-add-ext_file_read-and-ext_file_write.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0004-linux-syslinux-add-ext_file_read-and-ext_file_write.patch
rename to poky/meta/recipes-devtools/syslinux/syslinux/0004-linux-syslinux-add-ext_file_read-and-ext_file_write.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0005-linux-syslinux-implement-handle_adv_on_ext.patch b/poky/meta/recipes-devtools/syslinux/syslinux/0005-linux-syslinux-implement-handle_adv_on_ext.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0005-linux-syslinux-implement-handle_adv_on_ext.patch
rename to poky/meta/recipes-devtools/syslinux/syslinux/0005-linux-syslinux-implement-handle_adv_on_ext.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0006-linux-syslinux-implement-write_to_ext-and-add-syslin.patch b/poky/meta/recipes-devtools/syslinux/syslinux/0006-linux-syslinux-implement-write_to_ext-and-add-syslin.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0006-linux-syslinux-implement-write_to_ext-and-add-syslin.patch
rename to poky/meta/recipes-devtools/syslinux/syslinux/0006-linux-syslinux-implement-write_to_ext-and-add-syslin.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0007-linux-syslinux-implement-ext_construct_sectmap_fs.patch b/poky/meta/recipes-devtools/syslinux/syslinux/0007-linux-syslinux-implement-ext_construct_sectmap_fs.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0007-linux-syslinux-implement-ext_construct_sectmap_fs.patch
rename to poky/meta/recipes-devtools/syslinux/syslinux/0007-linux-syslinux-implement-ext_construct_sectmap_fs.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0008-libinstaller-syslinuxext-implement-syslinux_patch_bo.patch b/poky/meta/recipes-devtools/syslinux/syslinux/0008-libinstaller-syslinuxext-implement-syslinux_patch_bo.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0008-libinstaller-syslinuxext-implement-syslinux_patch_bo.patch
rename to poky/meta/recipes-devtools/syslinux/syslinux/0008-libinstaller-syslinuxext-implement-syslinux_patch_bo.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0009-linux-syslinux-implement-install_bootblock.patch b/poky/meta/recipes-devtools/syslinux/syslinux/0009-linux-syslinux-implement-install_bootblock.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0009-linux-syslinux-implement-install_bootblock.patch
rename to poky/meta/recipes-devtools/syslinux/syslinux/0009-linux-syslinux-implement-install_bootblock.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0010-gcc46-compatibility.patch b/poky/meta/recipes-devtools/syslinux/syslinux/0010-gcc46-compatibility.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0010-gcc46-compatibility.patch
rename to poky/meta/recipes-devtools/syslinux/syslinux/0010-gcc46-compatibility.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0011-mk-MMD-does-not-take-any-arguments.patch b/poky/meta/recipes-devtools/syslinux/syslinux/0011-mk-MMD-does-not-take-any-arguments.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/syslinux/syslinux/0011-mk-MMD-does-not-take-any-arguments.patch
rename to poky/meta/recipes-devtools/syslinux/syslinux/0011-mk-MMD-does-not-take-any-arguments.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/syslinux/syslinux/syslinux-6.03-sysmacros.patch b/poky/meta/recipes-devtools/syslinux/syslinux/syslinux-6.03-sysmacros.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/syslinux/syslinux/syslinux-6.03-sysmacros.patch
rename to poky/meta/recipes-devtools/syslinux/syslinux/syslinux-6.03-sysmacros.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/syslinux/syslinux/syslinux-fix-parallel-building-issue.patch b/poky/meta/recipes-devtools/syslinux/syslinux/syslinux-fix-parallel-building-issue.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/syslinux/syslinux/syslinux-fix-parallel-building-issue.patch
rename to poky/meta/recipes-devtools/syslinux/syslinux/syslinux-fix-parallel-building-issue.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/syslinux/syslinux/syslinux-libupload-depend-lib.patch b/poky/meta/recipes-devtools/syslinux/syslinux/syslinux-libupload-depend-lib.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/syslinux/syslinux/syslinux-libupload-depend-lib.patch
rename to poky/meta/recipes-devtools/syslinux/syslinux/syslinux-libupload-depend-lib.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/syslinux/syslinux/syslinux-remove-clean-script.patch b/poky/meta/recipes-devtools/syslinux/syslinux/syslinux-remove-clean-script.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/syslinux/syslinux/syslinux-remove-clean-script.patch
rename to poky/meta/recipes-devtools/syslinux/syslinux/syslinux-remove-clean-script.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/syslinux/syslinux_6.03.bb b/poky/meta/recipes-devtools/syslinux/syslinux_6.03.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/syslinux/syslinux_6.03.bb
rename to poky/meta/recipes-devtools/syslinux/syslinux_6.03.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch b/poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch
rename to poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0002-musl-does-not-provide-printf-h.patch b/poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0002-musl-does-not-provide-printf-h.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0002-musl-does-not-provide-printf-h.patch
rename to poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0002-musl-does-not-provide-printf-h.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0003-musl-does-not-provide-canonicalize_file_name.patch b/poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0003-musl-does-not-provide-canonicalize_file_name.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0003-musl-does-not-provide-canonicalize_file_name.patch
rename to poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0003-musl-does-not-provide-canonicalize_file_name.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_233.bb b/poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_233.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_233.bb
rename to poky/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_233.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent/0001-canonicalize_file_name-is-specific-to-glibc.patch b/poky/meta/recipes-devtools/tcf-agent/tcf-agent/0001-canonicalize_file_name-is-specific-to-glibc.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent/0001-canonicalize_file_name-is-specific-to-glibc.patch
rename to poky/meta/recipes-devtools/tcf-agent/tcf-agent/0001-canonicalize_file_name-is-specific-to-glibc.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch b/poky/meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch
rename to poky/meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent/ldflags.patch b/poky/meta/recipes-devtools/tcf-agent/tcf-agent/ldflags.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent/ldflags.patch
rename to poky/meta/recipes-devtools/tcf-agent/tcf-agent/ldflags.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.init b/poky/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.init
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.init
rename to poky/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.init
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.service b/poky/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.service
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.service
rename to poky/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.service
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/poky/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
rename to poky/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch b/poky/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch
rename to poky/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch b/poky/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch
rename to poky/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch b/poky/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch
rename to poky/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/tcltk/tcl/no_packages.patch b/poky/meta/recipes-devtools/tcltk/tcl/no_packages.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/tcltk/tcl/no_packages.patch
rename to poky/meta/recipes-devtools/tcltk/tcl/no_packages.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/tcltk/tcl/run-ptest b/poky/meta/recipes-devtools/tcltk/tcl/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/tcltk/tcl/run-ptest
rename to poky/meta/recipes-devtools/tcltk/tcl/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch b/poky/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
rename to poky/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch b/poky/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch
rename to poky/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/tcltk/tcl_8.6.8.bb b/poky/meta/recipes-devtools/tcltk/tcl_8.6.8.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/tcltk/tcl_8.6.8.bb
rename to poky/meta/recipes-devtools/tcltk/tcl_8.6.8.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/unfs3/unfs3/0001-daemon.c-Libtirpc-porting-fixes.patch b/poky/meta/recipes-devtools/unfs3/unfs3/0001-daemon.c-Libtirpc-porting-fixes.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/unfs3/unfs3/0001-daemon.c-Libtirpc-porting-fixes.patch
rename to poky/meta/recipes-devtools/unfs3/unfs3/0001-daemon.c-Libtirpc-porting-fixes.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/unfs3/unfs3/alternate_rpc_ports.patch b/poky/meta/recipes-devtools/unfs3/unfs3/alternate_rpc_ports.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/unfs3/unfs3/alternate_rpc_ports.patch
rename to poky/meta/recipes-devtools/unfs3/unfs3/alternate_rpc_ports.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/unfs3/unfs3/fix_compile_warning.patch b/poky/meta/recipes-devtools/unfs3/unfs3/fix_compile_warning.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/unfs3/unfs3/fix_compile_warning.patch
rename to poky/meta/recipes-devtools/unfs3/unfs3/fix_compile_warning.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/unfs3/unfs3/fix_pid_race_parent_writes_child_pid.patch b/poky/meta/recipes-devtools/unfs3/unfs3/fix_pid_race_parent_writes_child_pid.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/unfs3/unfs3/fix_pid_race_parent_writes_child_pid.patch
rename to poky/meta/recipes-devtools/unfs3/unfs3/fix_pid_race_parent_writes_child_pid.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/unfs3/unfs3/relative_max_socket_path_len.patch b/poky/meta/recipes-devtools/unfs3/unfs3/relative_max_socket_path_len.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/unfs3/unfs3/relative_max_socket_path_len.patch
rename to poky/meta/recipes-devtools/unfs3/unfs3/relative_max_socket_path_len.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/unfs3/unfs3/rename_fh_cache.patch b/poky/meta/recipes-devtools/unfs3/unfs3/rename_fh_cache.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/unfs3/unfs3/rename_fh_cache.patch
rename to poky/meta/recipes-devtools/unfs3/unfs3/rename_fh_cache.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/unfs3/unfs3/tcp_no_delay.patch b/poky/meta/recipes-devtools/unfs3/unfs3/tcp_no_delay.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/unfs3/unfs3/tcp_no_delay.patch
rename to poky/meta/recipes-devtools/unfs3/unfs3/tcp_no_delay.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/unfs3/unfs3/unfs3_parallel_build.patch b/poky/meta/recipes-devtools/unfs3/unfs3/unfs3_parallel_build.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/unfs3/unfs3/unfs3_parallel_build.patch
rename to poky/meta/recipes-devtools/unfs3/unfs3/unfs3_parallel_build.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/unfs3/unfs3_0.9.22.r497.bb b/poky/meta/recipes-devtools/unfs3/unfs3_0.9.22.r497.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/unfs3/unfs3_0.9.22.r497.bb
rename to poky/meta/recipes-devtools/unfs3/unfs3_0.9.22.r497.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/unifdef/unifdef_2.11.bb b/poky/meta/recipes-devtools/unifdef/unifdef_2.11.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/unifdef/unifdef_2.11.bb
rename to poky/meta/recipes-devtools/unifdef/unifdef_2.11.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/vala/vala.inc b/poky/meta/recipes-devtools/vala/vala.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/vala/vala.inc
rename to poky/meta/recipes-devtools/vala/vala.inc
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/vala/vala/0001-Disable-valadoc.patch b/poky/meta/recipes-devtools/vala/vala/0001-Disable-valadoc.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/vala/vala/0001-Disable-valadoc.patch
rename to poky/meta/recipes-devtools/vala/vala/0001-Disable-valadoc.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/vala/vala/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch b/poky/meta/recipes-devtools/vala/vala/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/vala/vala/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch
rename to poky/meta/recipes-devtools/vala/vala/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/vala/vala/0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch b/poky/meta/recipes-devtools/vala/vala/0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/vala/vala/0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch
rename to poky/meta/recipes-devtools/vala/vala/0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/vala/vala/disable-graphviz.patch b/poky/meta/recipes-devtools/vala/vala/disable-graphviz.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/vala/vala/disable-graphviz.patch
rename to poky/meta/recipes-devtools/vala/vala/disable-graphviz.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/vala/vala_0.38.8.bb b/poky/meta/recipes-devtools/vala/vala_0.38.8.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/vala/vala_0.38.8.bb
rename to poky/meta/recipes-devtools/vala/vala_0.38.8.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/0001-Remove-tests-that-fail-to-build-on-some-PPC32-config.patch b/poky/meta/recipes-devtools/valgrind/valgrind/0001-Remove-tests-that-fail-to-build-on-some-PPC32-config.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/0001-Remove-tests-that-fail-to-build-on-some-PPC32-config.patch
rename to poky/meta/recipes-devtools/valgrind/valgrind/0001-Remove-tests-that-fail-to-build-on-some-PPC32-config.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch b/poky/meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch
rename to poky/meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-arm64-Define-__THROW-if-not-already-defined.patch b/poky/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-arm64-Define-__THROW-if-not-already-defined.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-arm64-Define-__THROW-if-not-already-defined.patch
rename to poky/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-arm64-Define-__THROW-if-not-already-defined.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Use-ucontext_t-instead-of-struct-ucon.patch b/poky/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Use-ucontext_t-instead-of-struct-ucon.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Use-ucontext_t-instead-of-struct-ucon.patch
rename to poky/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Use-ucontext_t-instead-of-struct-ucon.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/0001-sigqueue-Rename-_sifields-to-__si_fields-on-musl.patch b/poky/meta/recipes-devtools/valgrind/valgrind/0001-sigqueue-Rename-_sifields-to-__si_fields-on-musl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/0001-sigqueue-Rename-_sifields-to-__si_fields-on-musl.patch
rename to poky/meta/recipes-devtools/valgrind/valgrind/0001-sigqueue-Rename-_sifields-to-__si_fields-on-musl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/0001-str_tester.c-Limit-rawmemchr-test-to-glibc.patch b/poky/meta/recipes-devtools/valgrind/valgrind/0001-str_tester.c-Limit-rawmemchr-test-to-glibc.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/0001-str_tester.c-Limit-rawmemchr-test-to-glibc.patch
rename to poky/meta/recipes-devtools/valgrind/valgrind/0001-str_tester.c-Limit-rawmemchr-test-to-glibc.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/0002-context-APIs-are-not-available-on-musl.patch b/poky/meta/recipes-devtools/valgrind/valgrind/0002-context-APIs-are-not-available-on-musl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/0002-context-APIs-are-not-available-on-musl.patch
rename to poky/meta/recipes-devtools/valgrind/valgrind/0002-context-APIs-are-not-available-on-musl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/0002-memcheck-x86-Define-__THROW-if-not-defined.patch b/poky/meta/recipes-devtools/valgrind/valgrind/0002-memcheck-x86-Define-__THROW-if-not-defined.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/0002-memcheck-x86-Define-__THROW-if-not-defined.patch
rename to poky/meta/recipes-devtools/valgrind/valgrind/0002-memcheck-x86-Define-__THROW-if-not-defined.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/0003-correct-include-directive-path-for-config.h.patch b/poky/meta/recipes-devtools/valgrind/valgrind/0003-correct-include-directive-path-for-config.h.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/0003-correct-include-directive-path-for-config.h.patch
rename to poky/meta/recipes-devtools/valgrind/valgrind/0003-correct-include-directive-path-for-config.h.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/0003-tests-seg_override-Replace-__modify_ldt-with-syscall.patch b/poky/meta/recipes-devtools/valgrind/valgrind/0003-tests-seg_override-Replace-__modify_ldt-with-syscall.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/0003-tests-seg_override-Replace-__modify_ldt-with-syscall.patch
rename to poky/meta/recipes-devtools/valgrind/valgrind/0003-tests-seg_override-Replace-__modify_ldt-with-syscall.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/0004-Fix-out-of-tree-builds.patch b/poky/meta/recipes-devtools/valgrind/valgrind/0004-Fix-out-of-tree-builds.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/0004-Fix-out-of-tree-builds.patch
rename to poky/meta/recipes-devtools/valgrind/valgrind/0004-Fix-out-of-tree-builds.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/0004-pth_atfork1.c-Define-error-API-for-musl.patch b/poky/meta/recipes-devtools/valgrind/valgrind/0004-pth_atfork1.c-Define-error-API-for-musl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/0004-pth_atfork1.c-Define-error-API-for-musl.patch
rename to poky/meta/recipes-devtools/valgrind/valgrind/0004-pth_atfork1.c-Define-error-API-for-musl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch b/poky/meta/recipes-devtools/valgrind/valgrind/0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch
rename to poky/meta/recipes-devtools/valgrind/valgrind/0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/0005-tc20_verifywrap.c-Fake-__GLIBC_PREREQ-with-musl.patch b/poky/meta/recipes-devtools/valgrind/valgrind/0005-tc20_verifywrap.c-Fake-__GLIBC_PREREQ-with-musl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/0005-tc20_verifywrap.c-Fake-__GLIBC_PREREQ-with-musl.patch
rename to poky/meta/recipes-devtools/valgrind/valgrind/0005-tc20_verifywrap.c-Fake-__GLIBC_PREREQ-with-musl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch b/poky/meta/recipes-devtools/valgrind/valgrind/0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch
rename to poky/meta/recipes-devtools/valgrind/valgrind/0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch b/poky/meta/recipes-devtools/valgrind/valgrind/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch
rename to poky/meta/recipes-devtools/valgrind/valgrind/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/avoid-neon-for-targets-which-don-t-support-it.patch b/poky/meta/recipes-devtools/valgrind/valgrind/avoid-neon-for-targets-which-don-t-support-it.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/avoid-neon-for-targets-which-don-t-support-it.patch
rename to poky/meta/recipes-devtools/valgrind/valgrind/avoid-neon-for-targets-which-don-t-support-it.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch b/poky/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch
rename to poky/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/link-gz-tests.patch b/poky/meta/recipes-devtools/valgrind/valgrind/link-gz-tests.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/link-gz-tests.patch
rename to poky/meta/recipes-devtools/valgrind/valgrind/link-gz-tests.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/mask-CPUID-support-in-HWCAP-on-aarch64.patch b/poky/meta/recipes-devtools/valgrind/valgrind/mask-CPUID-support-in-HWCAP-on-aarch64.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/mask-CPUID-support-in-HWCAP-on-aarch64.patch
rename to poky/meta/recipes-devtools/valgrind/valgrind/mask-CPUID-support-in-HWCAP-on-aarch64.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/ppc-headers.patch b/poky/meta/recipes-devtools/valgrind/valgrind/ppc-headers.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/ppc-headers.patch
rename to poky/meta/recipes-devtools/valgrind/valgrind/ppc-headers.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/run-ptest b/poky/meta/recipes-devtools/valgrind/valgrind/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/run-ptest
rename to poky/meta/recipes-devtools/valgrind/valgrind/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch b/poky/meta/recipes-devtools/valgrind/valgrind/use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch
rename to poky/meta/recipes-devtools/valgrind/valgrind/use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/valgrind-make-ld-XXX.so-strlen-intercept-optional.patch b/poky/meta/recipes-devtools/valgrind/valgrind/valgrind-make-ld-XXX.so-strlen-intercept-optional.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind/valgrind-make-ld-XXX.so-strlen-intercept-optional.patch
rename to poky/meta/recipes-devtools/valgrind/valgrind/valgrind-make-ld-XXX.so-strlen-intercept-optional.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind_3.13.0.bb b/poky/meta/recipes-devtools/valgrind/valgrind_3.13.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/valgrind/valgrind_3.13.0.bb
rename to poky/meta/recipes-devtools/valgrind/valgrind_3.13.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/xmlto/files/catalog.xml b/poky/meta/recipes-devtools/xmlto/files/catalog.xml
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/xmlto/files/catalog.xml
rename to poky/meta/recipes-devtools/xmlto/files/catalog.xml
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/xmlto/xmlto-0.0.28/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch b/poky/meta/recipes-devtools/xmlto/xmlto-0.0.28/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/xmlto/xmlto-0.0.28/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch
rename to poky/meta/recipes-devtools/xmlto/xmlto-0.0.28/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb b/poky/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb
rename to poky/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/yasm/yasm_1.3.0.bb b/poky/meta/recipes-devtools/yasm/yasm_1.3.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-devtools/yasm/yasm_1.3.0.bb
rename to poky/meta/recipes-devtools/yasm/yasm_1.3.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/acpica/acpica_20170303.bb b/poky/meta/recipes-extended/acpica/acpica_20170303.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/acpica/acpica_20170303.bb
rename to poky/meta/recipes-extended/acpica/acpica_20170303.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/acpica/files/0001-Linux-add-support-for-X32-ABI-compilation.patch b/poky/meta/recipes-extended/acpica/files/0001-Linux-add-support-for-X32-ABI-compilation.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/acpica/files/0001-Linux-add-support-for-X32-ABI-compilation.patch
rename to poky/meta/recipes-extended/acpica/files/0001-Linux-add-support-for-X32-ABI-compilation.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/acpica/files/manipulate-fds-instead-of-FILE.patch b/poky/meta/recipes-extended/acpica/files/manipulate-fds-instead-of-FILE.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/acpica/files/manipulate-fds-instead-of-FILE.patch
rename to poky/meta/recipes-extended/acpica/files/manipulate-fds-instead-of-FILE.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/acpica/files/rename-yy_scan_string-manually.patch b/poky/meta/recipes-extended/acpica/files/rename-yy_scan_string-manually.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/acpica/files/rename-yy_scan_string-manually.patch
rename to poky/meta/recipes-extended/acpica/files/rename-yy_scan_string-manually.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb b/poky/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb
rename to poky/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/at/at/0001-remove-glibc-assumption.patch b/poky/meta/recipes-extended/at/at/0001-remove-glibc-assumption.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/at/at/0001-remove-glibc-assumption.patch
rename to poky/meta/recipes-extended/at/at/0001-remove-glibc-assumption.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/at/at/atd.init b/poky/meta/recipes-extended/at/at/atd.init
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/at/at/atd.init
rename to poky/meta/recipes-extended/at/at/atd.init
diff --git a/import-layers/yocto-poky/meta/recipes-extended/at/at/atd.service b/poky/meta/recipes-extended/at/at/atd.service
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/at/at/atd.service
rename to poky/meta/recipes-extended/at/at/atd.service
diff --git a/import-layers/yocto-poky/meta/recipes-extended/at/at/configure-add-enable-pam.patch b/poky/meta/recipes-extended/at/at/configure-add-enable-pam.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/at/at/configure-add-enable-pam.patch
rename to poky/meta/recipes-extended/at/at/configure-add-enable-pam.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/at/at/file_replacement_with_gplv2.patch b/poky/meta/recipes-extended/at/at/file_replacement_with_gplv2.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/at/at/file_replacement_with_gplv2.patch
rename to poky/meta/recipes-extended/at/at/file_replacement_with_gplv2.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/at/at/fix_parallel_build_error.patch b/poky/meta/recipes-extended/at/at/fix_parallel_build_error.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/at/at/fix_parallel_build_error.patch
rename to poky/meta/recipes-extended/at/at/fix_parallel_build_error.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/at/at/makefile-fix-parallel.patch b/poky/meta/recipes-extended/at/at/makefile-fix-parallel.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/at/at/makefile-fix-parallel.patch
rename to poky/meta/recipes-extended/at/at/makefile-fix-parallel.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/at/at/pam.conf.patch b/poky/meta/recipes-extended/at/at/pam.conf.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/at/at/pam.conf.patch
rename to poky/meta/recipes-extended/at/at/pam.conf.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/at/at/posixtm.c b/poky/meta/recipes-extended/at/at/posixtm.c
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/at/at/posixtm.c
rename to poky/meta/recipes-extended/at/at/posixtm.c
diff --git a/import-layers/yocto-poky/meta/recipes-extended/at/at/posixtm.h b/poky/meta/recipes-extended/at/at/posixtm.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/at/at/posixtm.h
rename to poky/meta/recipes-extended/at/at/posixtm.h
diff --git a/import-layers/yocto-poky/meta/recipes-extended/at/at_3.1.20.bb b/poky/meta/recipes-extended/at/at_3.1.20.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/at/at_3.1.20.bb
rename to poky/meta/recipes-extended/at/at_3.1.20.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/bash/bash.inc b/poky/meta/recipes-extended/bash/bash.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/bash/bash.inc
rename to poky/meta/recipes-extended/bash/bash.inc
diff --git a/import-layers/yocto-poky/meta/recipes-extended/bash/bash/0001-help-fix-printf-format-security-warning.patch b/poky/meta/recipes-extended/bash/bash/0001-help-fix-printf-format-security-warning.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/bash/bash/0001-help-fix-printf-format-security-warning.patch
rename to poky/meta/recipes-extended/bash/bash/0001-help-fix-printf-format-security-warning.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/bash/bash/bash-memleak-bug-fix-for-builtin-command-read.patch b/poky/meta/recipes-extended/bash/bash/bash-memleak-bug-fix-for-builtin-command-read.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/bash/bash/bash-memleak-bug-fix-for-builtin-command-read.patch
rename to poky/meta/recipes-extended/bash/bash/bash-memleak-bug-fix-for-builtin-command-read.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/bash/bash/build-tests.patch b/poky/meta/recipes-extended/bash/bash/build-tests.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/bash/bash/build-tests.patch
rename to poky/meta/recipes-extended/bash/bash/build-tests.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/bash/bash/execute_cmd.patch b/poky/meta/recipes-extended/bash/bash/execute_cmd.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/bash/bash/execute_cmd.patch
rename to poky/meta/recipes-extended/bash/bash/execute_cmd.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/bash/bash/fix-run-builtins.patch b/poky/meta/recipes-extended/bash/bash/fix-run-builtins.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/bash/bash/fix-run-builtins.patch
rename to poky/meta/recipes-extended/bash/bash/fix-run-builtins.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/bash/bash/fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch b/poky/meta/recipes-extended/bash/bash/fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/bash/bash/fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch
rename to poky/meta/recipes-extended/bash/bash/fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/bash/bash/mkbuiltins_have_stringize.patch b/poky/meta/recipes-extended/bash/bash/mkbuiltins_have_stringize.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/bash/bash/mkbuiltins_have_stringize.patch
rename to poky/meta/recipes-extended/bash/bash/mkbuiltins_have_stringize.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/bash/bash/pathexp-dep.patch b/poky/meta/recipes-extended/bash/bash/pathexp-dep.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/bash/bash/pathexp-dep.patch
rename to poky/meta/recipes-extended/bash/bash/pathexp-dep.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/bash/bash/run-ptest b/poky/meta/recipes-extended/bash/bash/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/bash/bash/run-ptest
rename to poky/meta/recipes-extended/bash/bash/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-extended/bash/bash/test-output.patch b/poky/meta/recipes-extended/bash/bash/test-output.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/bash/bash/test-output.patch
rename to poky/meta/recipes-extended/bash/bash/test-output.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/bash/bash_4.4.12.bb b/poky/meta/recipes-extended/bash/bash_4.4.12.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/bash/bash_4.4.12.bb
rename to poky/meta/recipes-extended/bash/bash_4.4.12.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/bc/bc_1.06.bb b/poky/meta/recipes-extended/bc/bc_1.06.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/bc/bc_1.06.bb
rename to poky/meta/recipes-extended/bc/bc_1.06.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/bc/files/fix-segment-fault.patch b/poky/meta/recipes-extended/bc/files/fix-segment-fault.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/bc/files/fix-segment-fault.patch
rename to poky/meta/recipes-extended/bc/files/fix-segment-fault.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/blktool/blktool/0001-fix-typos-in-manpage.patch b/poky/meta/recipes-extended/blktool/blktool/0001-fix-typos-in-manpage.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/blktool/blktool/0001-fix-typos-in-manpage.patch
rename to poky/meta/recipes-extended/blktool/blktool/0001-fix-typos-in-manpage.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/blktool/blktool/0002-fix-string-error.patch b/poky/meta/recipes-extended/blktool/blktool/0002-fix-string-error.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/blktool/blktool/0002-fix-string-error.patch
rename to poky/meta/recipes-extended/blktool/blktool/0002-fix-string-error.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/blktool/blktool/0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch b/poky/meta/recipes-extended/blktool/blktool/0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/blktool/blktool/0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch
rename to poky/meta/recipes-extended/blktool/blktool/0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/blktool/blktool_4-7.bb b/poky/meta/recipes-extended/blktool/blktool_4-7.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/blktool/blktool_4-7.bb
rename to poky/meta/recipes-extended/blktool/blktool_4-7.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2016-3189.patch b/poky/meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2016-3189.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2016-3189.patch
rename to poky/meta/recipes-extended/bzip2/bzip2-1.0.6/CVE-2016-3189.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/bzip2/bzip2-1.0.6/Makefile.am b/poky/meta/recipes-extended/bzip2/bzip2-1.0.6/Makefile.am
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/bzip2/bzip2-1.0.6/Makefile.am
rename to poky/meta/recipes-extended/bzip2/bzip2-1.0.6/Makefile.am
diff --git a/import-layers/yocto-poky/meta/recipes-extended/bzip2/bzip2-1.0.6/configure.ac b/poky/meta/recipes-extended/bzip2/bzip2-1.0.6/configure.ac
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/bzip2/bzip2-1.0.6/configure.ac
rename to poky/meta/recipes-extended/bzip2/bzip2-1.0.6/configure.ac
diff --git a/import-layers/yocto-poky/meta/recipes-extended/bzip2/bzip2-1.0.6/fix-bunzip2-qt-returns-0-for-corrupt-archives.patch b/poky/meta/recipes-extended/bzip2/bzip2-1.0.6/fix-bunzip2-qt-returns-0-for-corrupt-archives.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/bzip2/bzip2-1.0.6/fix-bunzip2-qt-returns-0-for-corrupt-archives.patch
rename to poky/meta/recipes-extended/bzip2/bzip2-1.0.6/fix-bunzip2-qt-returns-0-for-corrupt-archives.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/bzip2/bzip2-1.0.6/run-ptest b/poky/meta/recipes-extended/bzip2/bzip2-1.0.6/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/bzip2/bzip2-1.0.6/run-ptest
rename to poky/meta/recipes-extended/bzip2/bzip2-1.0.6/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-extended/bzip2/bzip2_1.0.6.bb b/poky/meta/recipes-extended/bzip2/bzip2_1.0.6.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/bzip2/bzip2_1.0.6.bb
rename to poky/meta/recipes-extended/bzip2/bzip2_1.0.6.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb b/poky/meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb
rename to poky/meta/recipes-extended/chkconfig/chkconfig-alternatives-native_1.3.59.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch b/poky/meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch
rename to poky/meta/recipes-extended/chkconfig/chkconfig/replace_caddr_t.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb b/poky/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
rename to poky/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/cpio/cpio-2.12/0001-Fix-CVE-2015-1197.patch b/poky/meta/recipes-extended/cpio/cpio-2.12/0001-Fix-CVE-2015-1197.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/cpio/cpio-2.12/0001-Fix-CVE-2015-1197.patch
rename to poky/meta/recipes-extended/cpio/cpio-2.12/0001-Fix-CVE-2015-1197.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/cpio/cpio-2.12/0001-Unset-need_charset_alias-when-building-for-musl.patch b/poky/meta/recipes-extended/cpio/cpio-2.12/0001-Unset-need_charset_alias-when-building-for-musl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/cpio/cpio-2.12/0001-Unset-need_charset_alias-when-building-for-musl.patch
rename to poky/meta/recipes-extended/cpio/cpio-2.12/0001-Unset-need_charset_alias-when-building-for-musl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/cpio/cpio_2.12.bb b/poky/meta/recipes-extended/cpio/cpio_2.12.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/cpio/cpio_2.12.bb
rename to poky/meta/recipes-extended/cpio/cpio_2.12.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/cpio/cpio_v2.inc b/poky/meta/recipes-extended/cpio/cpio_v2.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/cpio/cpio_v2.inc
rename to poky/meta/recipes-extended/cpio/cpio_v2.inc
diff --git a/import-layers/yocto-poky/meta/recipes-extended/cracklib/cracklib/0001-Apply-patch-to-fix-CVE-2016-6318.patch b/poky/meta/recipes-extended/cracklib/cracklib/0001-Apply-patch-to-fix-CVE-2016-6318.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/cracklib/cracklib/0001-Apply-patch-to-fix-CVE-2016-6318.patch
rename to poky/meta/recipes-extended/cracklib/cracklib/0001-Apply-patch-to-fix-CVE-2016-6318.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch b/poky/meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch
rename to poky/meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/cracklib/cracklib/0002-craklib-fix-testnum-and-teststr-failed.patch b/poky/meta/recipes-extended/cracklib/cracklib/0002-craklib-fix-testnum-and-teststr-failed.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/cracklib/cracklib/0002-craklib-fix-testnum-and-teststr-failed.patch
rename to poky/meta/recipes-extended/cracklib/cracklib/0002-craklib-fix-testnum-and-teststr-failed.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/cracklib/cracklib_2.9.5.bb b/poky/meta/recipes-extended/cracklib/cracklib_2.9.5.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/cracklib/cracklib_2.9.5.bb
rename to poky/meta/recipes-extended/cracklib/cracklib_2.9.5.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/cronie/cronie/crond.init b/poky/meta/recipes-extended/cronie/cronie/crond.init
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/cronie/cronie/crond.init
rename to poky/meta/recipes-extended/cronie/cronie/crond.init
diff --git a/import-layers/yocto-poky/meta/recipes-extended/cronie/cronie/crond.service b/poky/meta/recipes-extended/cronie/cronie/crond.service
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/cronie/cronie/crond.service
rename to poky/meta/recipes-extended/cronie/cronie/crond.service
diff --git a/import-layers/yocto-poky/meta/recipes-extended/cronie/cronie/crond_pam_config.patch b/poky/meta/recipes-extended/cronie/cronie/crond_pam_config.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/cronie/cronie/crond_pam_config.patch
rename to poky/meta/recipes-extended/cronie/cronie/crond_pam_config.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/cronie/cronie/crontab b/poky/meta/recipes-extended/cronie/cronie/crontab
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/cronie/cronie/crontab
rename to poky/meta/recipes-extended/cronie/cronie/crontab
diff --git a/import-layers/yocto-poky/meta/recipes-extended/cronie/cronie_1.5.1.bb b/poky/meta/recipes-extended/cronie/cronie_1.5.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/cronie/cronie_1.5.1.bb
rename to poky/meta/recipes-extended/cronie/cronie_1.5.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/cups/cups.inc b/poky/meta/recipes-extended/cups/cups.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/cups/cups.inc
rename to poky/meta/recipes-extended/cups/cups.inc
diff --git a/import-layers/yocto-poky/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch b/poky/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch
rename to poky/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/cups/cups/cups_serverbin.patch b/poky/meta/recipes-extended/cups/cups/cups_serverbin.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/cups/cups/cups_serverbin.patch
rename to poky/meta/recipes-extended/cups/cups/cups_serverbin.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/cups/cups/use_echo_only_in_init.patch b/poky/meta/recipes-extended/cups/cups/use_echo_only_in_init.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/cups/cups/use_echo_only_in_init.patch
rename to poky/meta/recipes-extended/cups/cups/use_echo_only_in_init.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/cups/cups_2.2.6.bb b/poky/meta/recipes-extended/cups/cups_2.2.6.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/cups/cups_2.2.6.bb
rename to poky/meta/recipes-extended/cups/cups_2.2.6.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/cwautomacros/cwautomacros_20110201.bb b/poky/meta/recipes-extended/cwautomacros/cwautomacros_20110201.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/cwautomacros/cwautomacros_20110201.bb
rename to poky/meta/recipes-extended/cwautomacros/cwautomacros_20110201.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils-3.6/0001-Unset-need_charset_alias-when-building-for-musl.patch b/poky/meta/recipes-extended/diffutils/diffutils-3.6/0001-Unset-need_charset_alias-when-building-for-musl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils-3.6/0001-Unset-need_charset_alias-when-building-for-musl.patch
rename to poky/meta/recipes-extended/diffutils/diffutils-3.6/0001-Unset-need_charset_alias-when-building-for-musl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils-3.6/0001-explicitly-disable-replacing-getopt.patch b/poky/meta/recipes-extended/diffutils/diffutils-3.6/0001-explicitly-disable-replacing-getopt.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils-3.6/0001-explicitly-disable-replacing-getopt.patch
rename to poky/meta/recipes-extended/diffutils/diffutils-3.6/0001-explicitly-disable-replacing-getopt.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils-3.6/run-ptest b/poky/meta/recipes-extended/diffutils/diffutils-3.6/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils-3.6/run-ptest
rename to poky/meta/recipes-extended/diffutils/diffutils-3.6/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils.inc b/poky/meta/recipes-extended/diffutils/diffutils.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils.inc
rename to poky/meta/recipes-extended/diffutils/diffutils.inc
diff --git a/import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils_3.6.bb b/poky/meta/recipes-extended/diffutils/diffutils_3.6.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/diffutils/diffutils_3.6.bb
rename to poky/meta/recipes-extended/diffutils/diffutils_3.6.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ed/ed_1.14.2.bb b/poky/meta/recipes-extended/ed/ed_1.14.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ed/ed_1.14.2.bb
rename to poky/meta/recipes-extended/ed/ed_1.14.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch b/poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch
rename to poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ethtool/ethtool/run-ptest b/poky/meta/recipes-extended/ethtool/ethtool/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ethtool/ethtool/run-ptest
rename to poky/meta/recipes-extended/ethtool/ethtool/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ethtool/ethtool_4.13.bb b/poky/meta/recipes-extended/ethtool/ethtool_4.13.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ethtool/ethtool_4.13.bb
rename to poky/meta/recipes-extended/ethtool/ethtool_4.13.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/findutils/findutils.inc b/poky/meta/recipes-extended/findutils/findutils.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/findutils/findutils.inc
rename to poky/meta/recipes-extended/findutils/findutils.inc
diff --git a/import-layers/yocto-poky/meta/recipes-extended/findutils/findutils/0001-Unset-need_charset_alias-when-building-for-musl.patch b/poky/meta/recipes-extended/findutils/findutils/0001-Unset-need_charset_alias-when-building-for-musl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/findutils/findutils/0001-Unset-need_charset_alias-when-building-for-musl.patch
rename to poky/meta/recipes-extended/findutils/findutils/0001-Unset-need_charset_alias-when-building-for-musl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/findutils/findutils_4.6.0.bb b/poky/meta/recipes-extended/findutils/findutils_4.6.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/findutils/findutils_4.6.0.bb
rename to poky/meta/recipes-extended/findutils/findutils_4.6.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/foomatic/foomatic-filters-4.0.17/CVE-2015-8327.patch b/poky/meta/recipes-extended/foomatic/foomatic-filters-4.0.17/CVE-2015-8327.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/foomatic/foomatic-filters-4.0.17/CVE-2015-8327.patch
rename to poky/meta/recipes-extended/foomatic/foomatic-filters-4.0.17/CVE-2015-8327.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/foomatic/foomatic-filters-4.0.17/CVE-2015-8560.patch b/poky/meta/recipes-extended/foomatic/foomatic-filters-4.0.17/CVE-2015-8560.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/foomatic/foomatic-filters-4.0.17/CVE-2015-8560.patch
rename to poky/meta/recipes-extended/foomatic/foomatic-filters-4.0.17/CVE-2015-8560.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/foomatic/foomatic-filters_4.0.17.bb b/poky/meta/recipes-extended/foomatic/foomatic-filters_4.0.17.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/foomatic/foomatic-filters_4.0.17.bb
rename to poky/meta/recipes-extended/foomatic/foomatic-filters_4.0.17.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/gawk/gawk/run-ptest b/poky/meta/recipes-extended/gawk/gawk/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/gawk/gawk/run-ptest
rename to poky/meta/recipes-extended/gawk/gawk/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-extended/gawk/gawk_4.2.0.bb b/poky/meta/recipes-extended/gawk/gawk_4.2.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/gawk/gawk_4.2.0.bb
rename to poky/meta/recipes-extended/gawk/gawk_4.2.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/files/do-not-check-local-libpng-source.patch b/poky/meta/recipes-extended/ghostscript/files/do-not-check-local-libpng-source.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ghostscript/files/do-not-check-local-libpng-source.patch
rename to poky/meta/recipes-extended/ghostscript/files/do-not-check-local-libpng-source.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-11714.patch b/poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-11714.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-11714.patch
rename to poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-11714.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-5951.patch b/poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-5951.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-5951.patch
rename to poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-5951.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-7207.patch b/poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-7207.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-7207.patch
rename to poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-7207.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-7975.patch b/poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-7975.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-7975.patch
rename to poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-7975.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9216.patch b/poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9216.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9216.patch
rename to poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9216.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9611.patch b/poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9611.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9611.patch
rename to poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9611.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9612.patch b/poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9612.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9612.patch
rename to poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9612.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9726.patch b/poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9726.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9726.patch
rename to poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9726.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9727.patch b/poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9727.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9727.patch
rename to poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9727.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9739.patch b/poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9739.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9739.patch
rename to poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9739.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9835.patch b/poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9835.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9835.patch
rename to poky/meta/recipes-extended/ghostscript/ghostscript/CVE-2017-9835.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/aarch64/objarch.h b/poky/meta/recipes-extended/ghostscript/ghostscript/aarch64/objarch.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/aarch64/objarch.h
rename to poky/meta/recipes-extended/ghostscript/ghostscript/aarch64/objarch.h
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/arm/objarch.h b/poky/meta/recipes-extended/ghostscript/ghostscript/arm/objarch.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/arm/objarch.h
rename to poky/meta/recipes-extended/ghostscript/ghostscript/arm/objarch.h
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/armeb/objarch.h b/poky/meta/recipes-extended/ghostscript/ghostscript/armeb/objarch.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/armeb/objarch.h
rename to poky/meta/recipes-extended/ghostscript/ghostscript/armeb/objarch.h
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch b/poky/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch
rename to poky/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/base-genht.c-add-a-preprocessor-define-to-allow-fope.patch b/poky/meta/recipes-extended/ghostscript/ghostscript/base-genht.c-add-a-preprocessor-define-to-allow-fope.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/base-genht.c-add-a-preprocessor-define-to-allow-fope.patch
rename to poky/meta/recipes-extended/ghostscript/ghostscript/base-genht.c-add-a-preprocessor-define-to-allow-fope.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch b/poky/meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch
rename to poky/meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch b/poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch
rename to poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-genarch.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch b/poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch
rename to poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.16-Werror-return-type.patch b/poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.16-Werror-return-type.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.16-Werror-return-type.patch
rename to poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.16-Werror-return-type.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.21-native-fix-disable-system-libtiff.patch b/poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.21-native-fix-disable-system-libtiff.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.21-native-fix-disable-system-libtiff.patch
rename to poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.21-native-fix-disable-system-libtiff.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.21-prevent_recompiling.patch b/poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.21-prevent_recompiling.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.21-prevent_recompiling.patch
rename to poky/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.21-prevent_recompiling.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/i586/objarch.h b/poky/meta/recipes-extended/ghostscript/ghostscript/i586/objarch.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/i586/objarch.h
rename to poky/meta/recipes-extended/ghostscript/ghostscript/i586/objarch.h
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/i686 b/poky/meta/recipes-extended/ghostscript/ghostscript/i686
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/i686
rename to poky/meta/recipes-extended/ghostscript/ghostscript/i686
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/microblazeeb/objarch.h b/poky/meta/recipes-extended/ghostscript/ghostscript/microblazeeb/objarch.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/microblazeeb/objarch.h
rename to poky/meta/recipes-extended/ghostscript/ghostscript/microblazeeb/objarch.h
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/microblazeel/objarch.h b/poky/meta/recipes-extended/ghostscript/ghostscript/microblazeel/objarch.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/microblazeel/objarch.h
rename to poky/meta/recipes-extended/ghostscript/ghostscript/microblazeel/objarch.h
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/mipsarchn32eb/objarch.h b/poky/meta/recipes-extended/ghostscript/ghostscript/mipsarchn32eb/objarch.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/mipsarchn32eb/objarch.h
rename to poky/meta/recipes-extended/ghostscript/ghostscript/mipsarchn32eb/objarch.h
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/mipsarchn32el/objarch.h b/poky/meta/recipes-extended/ghostscript/ghostscript/mipsarchn32el/objarch.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/mipsarchn32el/objarch.h
rename to poky/meta/recipes-extended/ghostscript/ghostscript/mipsarchn32el/objarch.h
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/mipsarchn64eb/objarch.h b/poky/meta/recipes-extended/ghostscript/ghostscript/mipsarchn64eb/objarch.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/mipsarchn64eb/objarch.h
rename to poky/meta/recipes-extended/ghostscript/ghostscript/mipsarchn64eb/objarch.h
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/mipsarchn64el/objarch.h b/poky/meta/recipes-extended/ghostscript/ghostscript/mipsarchn64el/objarch.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/mipsarchn64el/objarch.h
rename to poky/meta/recipes-extended/ghostscript/ghostscript/mipsarchn64el/objarch.h
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/mipsarcho32eb/objarch.h b/poky/meta/recipes-extended/ghostscript/ghostscript/mipsarcho32eb/objarch.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/mipsarcho32eb/objarch.h
rename to poky/meta/recipes-extended/ghostscript/ghostscript/mipsarcho32eb/objarch.h
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/mipsarcho32el/objarch.h b/poky/meta/recipes-extended/ghostscript/ghostscript/mipsarcho32el/objarch.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/mipsarcho32el/objarch.h
rename to poky/meta/recipes-extended/ghostscript/ghostscript/mipsarcho32el/objarch.h
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/mkdir-p.patch b/poky/meta/recipes-extended/ghostscript/ghostscript/mkdir-p.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/mkdir-p.patch
rename to poky/meta/recipes-extended/ghostscript/ghostscript/mkdir-p.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/nios2/objarch.h b/poky/meta/recipes-extended/ghostscript/ghostscript/nios2/objarch.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/nios2/objarch.h
rename to poky/meta/recipes-extended/ghostscript/ghostscript/nios2/objarch.h
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/powerpc/objarch.h b/poky/meta/recipes-extended/ghostscript/ghostscript/powerpc/objarch.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/powerpc/objarch.h
rename to poky/meta/recipes-extended/ghostscript/ghostscript/powerpc/objarch.h
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/powerpc64/objarch.h b/poky/meta/recipes-extended/ghostscript/ghostscript/powerpc64/objarch.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/powerpc64/objarch.h
rename to poky/meta/recipes-extended/ghostscript/ghostscript/powerpc64/objarch.h
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/x86-64/objarch.h b/poky/meta/recipes-extended/ghostscript/ghostscript/x86-64/objarch.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript/x86-64/objarch.h
rename to poky/meta/recipes-extended/ghostscript/ghostscript/x86-64/objarch.h
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript_9.21.bb b/poky/meta/recipes-extended/ghostscript/ghostscript_9.21.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ghostscript/ghostscript_9.21.bb
rename to poky/meta/recipes-extended/ghostscript/ghostscript_9.21.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/go-examples/go-helloworld_0.1.bb b/poky/meta/recipes-extended/go-examples/go-helloworld_0.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/go-examples/go-helloworld_0.1.bb
rename to poky/meta/recipes-extended/go-examples/go-helloworld_0.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/gperf/gperf_3.1.bb b/poky/meta/recipes-extended/gperf/gperf_3.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/gperf/gperf_3.1.bb
rename to poky/meta/recipes-extended/gperf/gperf_3.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/grep/grep/0001-Unset-need_charset_alias-when-building-for-musl.patch b/poky/meta/recipes-extended/grep/grep/0001-Unset-need_charset_alias-when-building-for-musl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/grep/grep/0001-Unset-need_charset_alias-when-building-for-musl.patch
rename to poky/meta/recipes-extended/grep/grep/0001-Unset-need_charset_alias-when-building-for-musl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/grep/grep_3.1.bb b/poky/meta/recipes-extended/grep/grep_3.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/grep/grep_3.1.bb
rename to poky/meta/recipes-extended/grep/grep_3.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/groff/groff-1.22.3/0001-Unset-need_charset_alias-when-building-for-musl.patch b/poky/meta/recipes-extended/groff/groff-1.22.3/0001-Unset-need_charset_alias-when-building-for-musl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/groff/groff-1.22.3/0001-Unset-need_charset_alias-when-building-for-musl.patch
rename to poky/meta/recipes-extended/groff/groff-1.22.3/0001-Unset-need_charset_alias-when-building-for-musl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/groff/groff-1.22.3/0001-replace-perl-w-with-use-warnings.patch b/poky/meta/recipes-extended/groff/groff-1.22.3/0001-replace-perl-w-with-use-warnings.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/groff/groff-1.22.3/0001-replace-perl-w-with-use-warnings.patch
rename to poky/meta/recipes-extended/groff/groff-1.22.3/0001-replace-perl-w-with-use-warnings.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/groff/groff-1.22.3/groff-1.22.2-correct-man.local-install-path.patch b/poky/meta/recipes-extended/groff/groff-1.22.3/groff-1.22.2-correct-man.local-install-path.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/groff/groff-1.22.3/groff-1.22.2-correct-man.local-install-path.patch
rename to poky/meta/recipes-extended/groff/groff-1.22.3/groff-1.22.2-correct-man.local-install-path.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/groff/groff_1.22.3.bb b/poky/meta/recipes-extended/groff/groff_1.22.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/groff/groff_1.22.3.bb
rename to poky/meta/recipes-extended/groff/groff_1.22.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/gzip/files/run-ptest b/poky/meta/recipes-extended/gzip/files/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/gzip/files/run-ptest
rename to poky/meta/recipes-extended/gzip/files/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-extended/gzip/gzip-1.9/wrong-path-fix.patch b/poky/meta/recipes-extended/gzip/gzip-1.9/wrong-path-fix.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/gzip/gzip-1.9/wrong-path-fix.patch
rename to poky/meta/recipes-extended/gzip/gzip-1.9/wrong-path-fix.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/gzip/gzip.inc b/poky/meta/recipes-extended/gzip/gzip.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/gzip/gzip.inc
rename to poky/meta/recipes-extended/gzip/gzip.inc
diff --git a/import-layers/yocto-poky/meta/recipes-extended/gzip/gzip_1.9.bb b/poky/meta/recipes-extended/gzip/gzip_1.9.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/gzip/gzip_1.9.bb
rename to poky/meta/recipes-extended/gzip/gzip_1.9.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/hdparm/hdparm/wiper.sh-fix-stat-path.patch b/poky/meta/recipes-extended/hdparm/hdparm/wiper.sh-fix-stat-path.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/hdparm/hdparm/wiper.sh-fix-stat-path.patch
rename to poky/meta/recipes-extended/hdparm/hdparm/wiper.sh-fix-stat-path.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/hdparm/hdparm_9.53.bb b/poky/meta/recipes-extended/hdparm/hdparm_9.53.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/hdparm/hdparm_9.53.bb
rename to poky/meta/recipes-extended/hdparm/hdparm_9.53.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/images/core-image-full-cmdline.bb b/poky/meta/recipes-extended/images/core-image-full-cmdline.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/images/core-image-full-cmdline.bb
rename to poky/meta/recipes-extended/images/core-image-full-cmdline.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/images/core-image-kernel-dev.bb b/poky/meta/recipes-extended/images/core-image-kernel-dev.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/images/core-image-kernel-dev.bb
rename to poky/meta/recipes-extended/images/core-image-kernel-dev.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/images/core-image-lsb-dev.bb b/poky/meta/recipes-extended/images/core-image-lsb-dev.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/images/core-image-lsb-dev.bb
rename to poky/meta/recipes-extended/images/core-image-lsb-dev.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/images/core-image-lsb-sdk.bb b/poky/meta/recipes-extended/images/core-image-lsb-sdk.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/images/core-image-lsb-sdk.bb
rename to poky/meta/recipes-extended/images/core-image-lsb-sdk.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/images/core-image-lsb.bb b/poky/meta/recipes-extended/images/core-image-lsb.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/images/core-image-lsb.bb
rename to poky/meta/recipes-extended/images/core-image-lsb.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/images/core-image-testmaster-initramfs.bb b/poky/meta/recipes-extended/images/core-image-testmaster-initramfs.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/images/core-image-testmaster-initramfs.bb
rename to poky/meta/recipes-extended/images/core-image-testmaster-initramfs.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/images/core-image-testmaster.bb b/poky/meta/recipes-extended/images/core-image-testmaster.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/images/core-image-testmaster.bb
rename to poky/meta/recipes-extended/images/core-image-testmaster.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch b/poky/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch
rename to poky/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/iptables/iptables/0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch b/poky/meta/recipes-extended/iptables/iptables/0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/iptables/iptables/0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch
rename to poky/meta/recipes-extended/iptables/iptables/0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/iptables/iptables_1.6.2.bb b/poky/meta/recipes-extended/iptables/iptables_1.6.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/iptables/iptables_1.6.2.bb
rename to poky/meta/recipes-extended/iptables/iptables_1.6.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/iputils/files/0001-Fix-build-on-MUSL.patch b/poky/meta/recipes-extended/iputils/files/0001-Fix-build-on-MUSL.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/iputils/files/0001-Fix-build-on-MUSL.patch
rename to poky/meta/recipes-extended/iputils/files/0001-Fix-build-on-MUSL.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/iputils/iputils_s20161105.bb b/poky/meta/recipes-extended/iputils/iputils_s20161105.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/iputils/iputils_s20161105.bb
rename to poky/meta/recipes-extended/iputils/iputils_s20161105.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/less/less_529.bb b/poky/meta/recipes-extended/less/less_529.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/less/less_529.bb
rename to poky/meta/recipes-extended/less/less_529.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/libaio/libaio/00_arches.patch b/poky/meta/recipes-extended/libaio/libaio/00_arches.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/libaio/libaio/00_arches.patch
rename to poky/meta/recipes-extended/libaio/libaio/00_arches.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/libaio/libaio/destdir.patch b/poky/meta/recipes-extended/libaio/libaio/destdir.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/libaio/libaio/destdir.patch
rename to poky/meta/recipes-extended/libaio/libaio/destdir.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/libaio/libaio/generic-arch-dectection-for-padding-defines.patch b/poky/meta/recipes-extended/libaio/libaio/generic-arch-dectection-for-padding-defines.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/libaio/libaio/generic-arch-dectection-for-padding-defines.patch
rename to poky/meta/recipes-extended/libaio/libaio/generic-arch-dectection-for-padding-defines.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/libaio/libaio/libaio_fix_for_mips_syscalls.patch b/poky/meta/recipes-extended/libaio/libaio/libaio_fix_for_mips_syscalls.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/libaio/libaio/libaio_fix_for_mips_syscalls.patch
rename to poky/meta/recipes-extended/libaio/libaio/libaio_fix_for_mips_syscalls.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/libaio/libaio/libaio_fix_for_x32.patch b/poky/meta/recipes-extended/libaio/libaio/libaio_fix_for_x32.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/libaio/libaio/libaio_fix_for_x32.patch
rename to poky/meta/recipes-extended/libaio/libaio/libaio_fix_for_x32.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/libaio/libaio/system-linkage.patch b/poky/meta/recipes-extended/libaio/libaio/system-linkage.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/libaio/libaio/system-linkage.patch
rename to poky/meta/recipes-extended/libaio/libaio/system-linkage.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/libaio/libaio_0.3.110.bb b/poky/meta/recipes-extended/libaio/libaio_0.3.110.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/libaio/libaio_0.3.110.bb
rename to poky/meta/recipes-extended/libaio/libaio_0.3.110.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/libarchive/libarchive/CVE-2017-14166.patch b/poky/meta/recipes-extended/libarchive/libarchive/CVE-2017-14166.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/libarchive/libarchive/CVE-2017-14166.patch
rename to poky/meta/recipes-extended/libarchive/libarchive/CVE-2017-14166.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/libarchive/libarchive/CVE-2017-14502.patch b/poky/meta/recipes-extended/libarchive/libarchive/CVE-2017-14502.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/libarchive/libarchive/CVE-2017-14502.patch
rename to poky/meta/recipes-extended/libarchive/libarchive/CVE-2017-14502.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/libarchive/libarchive/bug929.patch b/poky/meta/recipes-extended/libarchive/libarchive/bug929.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/libarchive/libarchive/bug929.patch
rename to poky/meta/recipes-extended/libarchive/libarchive/bug929.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/libarchive/libarchive/non-recursive-extract-and-list.patch b/poky/meta/recipes-extended/libarchive/libarchive/non-recursive-extract-and-list.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/libarchive/libarchive/non-recursive-extract-and-list.patch
rename to poky/meta/recipes-extended/libarchive/libarchive/non-recursive-extract-and-list.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/libarchive/libarchive_3.3.2.bb b/poky/meta/recipes-extended/libarchive/libarchive_3.3.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/libarchive/libarchive_3.3.2.bb
rename to poky/meta/recipes-extended/libarchive/libarchive_3.3.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/libidn/libidn/0001-idn-fix-printf-format-security-warnings.patch b/poky/meta/recipes-extended/libidn/libidn/0001-idn-fix-printf-format-security-warnings.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/libidn/libidn/0001-idn-fix-printf-format-security-warnings.patch
rename to poky/meta/recipes-extended/libidn/libidn/0001-idn-fix-printf-format-security-warnings.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch b/poky/meta/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch
rename to poky/meta/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch b/poky/meta/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch
rename to poky/meta/recipes-extended/libidn/libidn/avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch b/poky/meta/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch
rename to poky/meta/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/libidn/libidn/gcc7-compatibility.patch b/poky/meta/recipes-extended/libidn/libidn/gcc7-compatibility.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/libidn/libidn/gcc7-compatibility.patch
rename to poky/meta/recipes-extended/libidn/libidn/gcc7-compatibility.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch b/poky/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch
rename to poky/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/libidn/libidn_1.33.bb b/poky/meta/recipes-extended/libidn/libidn_1.33.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/libidn/libidn_1.33.bb
rename to poky/meta/recipes-extended/libidn/libidn_1.33.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/libmnl/libmnl_1.0.4.bb b/poky/meta/recipes-extended/libmnl/libmnl_1.0.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/libmnl/libmnl_1.0.4.bb
rename to poky/meta/recipes-extended/libmnl/libmnl_1.0.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/libnsl/libnsl2/0001-include-sys-cdefs.h-explicitly.patch b/poky/meta/recipes-extended/libnsl/libnsl2/0001-include-sys-cdefs.h-explicitly.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/libnsl/libnsl2/0001-include-sys-cdefs.h-explicitly.patch
rename to poky/meta/recipes-extended/libnsl/libnsl2/0001-include-sys-cdefs.h-explicitly.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/libnsl/libnsl2/0001-nis_call.c-Include-stdint.h-for-uintptr_t-definition.patch b/poky/meta/recipes-extended/libnsl/libnsl2/0001-nis_call.c-Include-stdint.h-for-uintptr_t-definition.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/libnsl/libnsl2/0001-nis_call.c-Include-stdint.h-for-uintptr_t-definition.patch
rename to poky/meta/recipes-extended/libnsl/libnsl2/0001-nis_call.c-Include-stdint.h-for-uintptr_t-definition.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/libnsl/libnsl2/0002-Define-glibc-specific-macros.patch b/poky/meta/recipes-extended/libnsl/libnsl2/0002-Define-glibc-specific-macros.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/libnsl/libnsl2/0002-Define-glibc-specific-macros.patch
rename to poky/meta/recipes-extended/libnsl/libnsl2/0002-Define-glibc-specific-macros.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/libnsl/libnsl2_git.bb b/poky/meta/recipes-extended/libnsl/libnsl2_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/libnsl/libnsl2_git.bb
rename to poky/meta/recipes-extended/libnsl/libnsl2_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/libpipeline/libpipeline_1.5.0.bb b/poky/meta/recipes-extended/libpipeline/libpipeline_1.5.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/libpipeline/libpipeline_1.5.0.bb
rename to poky/meta/recipes-extended/libpipeline/libpipeline_1.5.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/libsolv/libsolv/0001-Add-fallback-fopencookie-implementation.patch b/poky/meta/recipes-extended/libsolv/libsolv/0001-Add-fallback-fopencookie-implementation.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/libsolv/libsolv/0001-Add-fallback-fopencookie-implementation.patch
rename to poky/meta/recipes-extended/libsolv/libsolv/0001-Add-fallback-fopencookie-implementation.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/libsolv/libsolv/0002-Fixes-to-internal-fopencookie-implementation.patch b/poky/meta/recipes-extended/libsolv/libsolv/0002-Fixes-to-internal-fopencookie-implementation.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/libsolv/libsolv/0002-Fixes-to-internal-fopencookie-implementation.patch
rename to poky/meta/recipes-extended/libsolv/libsolv/0002-Fixes-to-internal-fopencookie-implementation.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/libsolv/libsolv_0.6.33.bb b/poky/meta/recipes-extended/libsolv/libsolv_0.6.33.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/libsolv/libsolv_0.6.33.bb
rename to poky/meta/recipes-extended/libsolv/libsolv_0.6.33.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/libtirpc/libtirpc/0001-include-stdint.h-for-uintptr_t.patch b/poky/meta/recipes-extended/libtirpc/libtirpc/0001-include-stdint.h-for-uintptr_t.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/libtirpc/libtirpc/0001-include-stdint.h-for-uintptr_t.patch
rename to poky/meta/recipes-extended/libtirpc/libtirpc/0001-include-stdint.h-for-uintptr_t.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/libtirpc/libtirpc/0001-replace-__bzero-with-memset-API.patch b/poky/meta/recipes-extended/libtirpc/libtirpc/0001-replace-__bzero-with-memset-API.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/libtirpc/libtirpc/0001-replace-__bzero-with-memset-API.patch
rename to poky/meta/recipes-extended/libtirpc/libtirpc/0001-replace-__bzero-with-memset-API.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/libtirpc/libtirpc/Use-netbsd-queue.h.patch b/poky/meta/recipes-extended/libtirpc/libtirpc/Use-netbsd-queue.h.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/libtirpc/libtirpc/Use-netbsd-queue.h.patch
rename to poky/meta/recipes-extended/libtirpc/libtirpc/Use-netbsd-queue.h.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/libtirpc/libtirpc/export_key_secretkey_is_set.patch b/poky/meta/recipes-extended/libtirpc/libtirpc/export_key_secretkey_is_set.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/libtirpc/libtirpc/export_key_secretkey_is_set.patch
rename to poky/meta/recipes-extended/libtirpc/libtirpc/export_key_secretkey_is_set.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/libtirpc/libtirpc_1.0.2.bb b/poky/meta/recipes-extended/libtirpc/libtirpc_1.0.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/libtirpc/libtirpc_1.0.2.bb
rename to poky/meta/recipes-extended/libtirpc/libtirpc_1.0.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/libuser/libuser/0001-Check-for-issetugid.patch b/poky/meta/recipes-extended/libuser/libuser/0001-Check-for-issetugid.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/libuser/libuser/0001-Check-for-issetugid.patch
rename to poky/meta/recipes-extended/libuser/libuser/0001-Check-for-issetugid.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/libuser/libuser/0001-modules-files.c-parse_field-fix-string-formating-in-.patch b/poky/meta/recipes-extended/libuser/libuser/0001-modules-files.c-parse_field-fix-string-formating-in-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/libuser/libuser/0001-modules-files.c-parse_field-fix-string-formating-in-.patch
rename to poky/meta/recipes-extended/libuser/libuser/0001-modules-files.c-parse_field-fix-string-formating-in-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/libuser/libuser/0002-remove-unused-execinfo.h.patch b/poky/meta/recipes-extended/libuser/libuser/0002-remove-unused-execinfo.h.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/libuser/libuser/0002-remove-unused-execinfo.h.patch
rename to poky/meta/recipes-extended/libuser/libuser/0002-remove-unused-execinfo.h.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/libuser/libuser_0.62.bb b/poky/meta/recipes-extended/libuser/libuser_0.62.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/libuser/libuser_0.62.bb
rename to poky/meta/recipes-extended/libuser/libuser_0.62.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch b/poky/meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch
rename to poky/meta/recipes-extended/lighttpd/lighttpd/0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/lighttpd/lighttpd/index.html.lighttpd b/poky/meta/recipes-extended/lighttpd/lighttpd/index.html.lighttpd
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/lighttpd/lighttpd/index.html.lighttpd
rename to poky/meta/recipes-extended/lighttpd/lighttpd/index.html.lighttpd
diff --git a/import-layers/yocto-poky/meta/recipes-extended/lighttpd/lighttpd/lighttpd b/poky/meta/recipes-extended/lighttpd/lighttpd/lighttpd
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/lighttpd/lighttpd/lighttpd
rename to poky/meta/recipes-extended/lighttpd/lighttpd/lighttpd
diff --git a/import-layers/yocto-poky/meta/recipes-extended/lighttpd/lighttpd/lighttpd.conf b/poky/meta/recipes-extended/lighttpd/lighttpd/lighttpd.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/lighttpd/lighttpd/lighttpd.conf
rename to poky/meta/recipes-extended/lighttpd/lighttpd/lighttpd.conf
diff --git a/import-layers/yocto-poky/meta/recipes-extended/lighttpd/lighttpd/lighttpd.service b/poky/meta/recipes-extended/lighttpd/lighttpd/lighttpd.service
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/lighttpd/lighttpd/lighttpd.service
rename to poky/meta/recipes-extended/lighttpd/lighttpd/lighttpd.service
diff --git a/import-layers/yocto-poky/meta/recipes-extended/lighttpd/lighttpd_1.4.48.bb b/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.48.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/lighttpd/lighttpd_1.4.48.bb
rename to poky/meta/recipes-extended/lighttpd/lighttpd_1.4.48.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch b/poky/meta/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch
rename to poky/meta/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch b/poky/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch
rename to poky/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/logrotate/logrotate/update-the-manual.patch b/poky/meta/recipes-extended/logrotate/logrotate/update-the-manual.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/logrotate/logrotate/update-the-manual.patch
rename to poky/meta/recipes-extended/logrotate/logrotate/update-the-manual.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/logrotate/logrotate_3.13.0.bb b/poky/meta/recipes-extended/logrotate/logrotate_3.13.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/logrotate/logrotate_3.13.0.bb
rename to poky/meta/recipes-extended/logrotate/logrotate_3.13.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsb/0001-fix-lsb_release-to-work-with-busybox-head-and-find.patch b/poky/meta/recipes-extended/lsb/lsb/0001-fix-lsb_release-to-work-with-busybox-head-and-find.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/lsb/lsb/0001-fix-lsb_release-to-work-with-busybox-head-and-find.patch
rename to poky/meta/recipes-extended/lsb/lsb/0001-fix-lsb_release-to-work-with-busybox-head-and-find.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsb/init-functions b/poky/meta/recipes-extended/lsb/lsb/init-functions
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/lsb/lsb/init-functions
rename to poky/meta/recipes-extended/lsb/lsb/init-functions
diff --git a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsb/lsb_killproc b/poky/meta/recipes-extended/lsb/lsb/lsb_killproc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/lsb/lsb/lsb_killproc
rename to poky/meta/recipes-extended/lsb/lsb/lsb_killproc
diff --git a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsb/lsb_log_message b/poky/meta/recipes-extended/lsb/lsb/lsb_log_message
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/lsb/lsb/lsb_log_message
rename to poky/meta/recipes-extended/lsb/lsb/lsb_log_message
diff --git a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsb/lsb_pidofproc b/poky/meta/recipes-extended/lsb/lsb/lsb_pidofproc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/lsb/lsb/lsb_pidofproc
rename to poky/meta/recipes-extended/lsb/lsb/lsb_pidofproc
diff --git a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsb/lsb_start_daemon b/poky/meta/recipes-extended/lsb/lsb/lsb_start_daemon
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/lsb/lsb/lsb_start_daemon
rename to poky/meta/recipes-extended/lsb/lsb/lsb_start_daemon
diff --git a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsb_5.0.bb b/poky/meta/recipes-extended/lsb/lsb_5.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/lsb/lsb_5.0.bb
rename to poky/meta/recipes-extended/lsb/lsb_5.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch b/poky/meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch
rename to poky/meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts/functions.patch b/poky/meta/recipes-extended/lsb/lsbinitscripts/functions.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts/functions.patch
rename to poky/meta/recipes-extended/lsb/lsbinitscripts/functions.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts_9.79.bb b/poky/meta/recipes-extended/lsb/lsbinitscripts_9.79.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts_9.79.bb
rename to poky/meta/recipes-extended/lsb/lsbinitscripts_9.79.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh b/poky/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh
rename to poky/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh
diff --git a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest/packages_list b/poky/meta/recipes-extended/lsb/lsbtest/packages_list
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest/packages_list
rename to poky/meta/recipes-extended/lsb/lsbtest/packages_list
diff --git a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest/session b/poky/meta/recipes-extended/lsb/lsbtest/session
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest/session
rename to poky/meta/recipes-extended/lsb/lsbtest/session
diff --git a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest_1.0.bb b/poky/meta/recipes-extended/lsb/lsbtest_1.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest_1.0.bb
rename to poky/meta/recipes-extended/lsb/lsbtest_1.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/lsof/files/lsof-remove-host-information.patch b/poky/meta/recipes-extended/lsof/files/lsof-remove-host-information.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/lsof/files/lsof-remove-host-information.patch
rename to poky/meta/recipes-extended/lsof/files/lsof-remove-host-information.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/lsof/lsof_4.89.bb b/poky/meta/recipes-extended/lsof/lsof_4.89.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/lsof/lsof_4.89.bb
rename to poky/meta/recipes-extended/lsof/lsof_4.89.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0001-configure-Fix-default-value-of-without-numa-switch-i.patch b/poky/meta/recipes-extended/ltp/ltp/0001-configure-Fix-default-value-of-without-numa-switch-i.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0001-configure-Fix-default-value-of-without-numa-switch-i.patch
rename to poky/meta/recipes-extended/ltp/ltp/0001-configure-Fix-default-value-of-without-numa-switch-i.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0001-configure-add-knob-to-control-numa-support.patch b/poky/meta/recipes-extended/ltp/ltp/0001-configure-add-knob-to-control-numa-support.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0001-configure-add-knob-to-control-numa-support.patch
rename to poky/meta/recipes-extended/ltp/ltp/0001-configure-add-knob-to-control-numa-support.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0003-Add-knob-to-control-tirpc-support.patch b/poky/meta/recipes-extended/ltp/ltp/0003-Add-knob-to-control-tirpc-support.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0003-Add-knob-to-control-tirpc-support.patch
rename to poky/meta/recipes-extended/ltp/ltp/0003-Add-knob-to-control-tirpc-support.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0004-build-Add-option-to-select-libc-implementation.patch b/poky/meta/recipes-extended/ltp/ltp/0004-build-Add-option-to-select-libc-implementation.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0004-build-Add-option-to-select-libc-implementation.patch
rename to poky/meta/recipes-extended/ltp/ltp/0004-build-Add-option-to-select-libc-implementation.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0005-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch b/poky/meta/recipes-extended/ltp/ltp/0005-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0005-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch
rename to poky/meta/recipes-extended/ltp/ltp/0005-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0007-fix-__WORDSIZE-undeclared-when-building-with-musl.patch b/poky/meta/recipes-extended/ltp/ltp/0007-fix-__WORDSIZE-undeclared-when-building-with-musl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0007-fix-__WORDSIZE-undeclared-when-building-with-musl.patch
rename to poky/meta/recipes-extended/ltp/ltp/0007-fix-__WORDSIZE-undeclared-when-building-with-musl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch b/poky/meta/recipes-extended/ltp/ltp/0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch
rename to poky/meta/recipes-extended/ltp/ltp/0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0009-fix-redefinition-of-struct-msgbuf-error-building-wit.patch b/poky/meta/recipes-extended/ltp/ltp/0009-fix-redefinition-of-struct-msgbuf-error-building-wit.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0009-fix-redefinition-of-struct-msgbuf-error-building-wit.patch
rename to poky/meta/recipes-extended/ltp/ltp/0009-fix-redefinition-of-struct-msgbuf-error-building-wit.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0010-replace-__BEGIN_DECLS-and-__END_DECLS.patch b/poky/meta/recipes-extended/ltp/ltp/0010-replace-__BEGIN_DECLS-and-__END_DECLS.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0010-replace-__BEGIN_DECLS-and-__END_DECLS.patch
rename to poky/meta/recipes-extended/ltp/ltp/0010-replace-__BEGIN_DECLS-and-__END_DECLS.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0018-guard-mallocopt-with-__GLIBC__.patch b/poky/meta/recipes-extended/ltp/ltp/0018-guard-mallocopt-with-__GLIBC__.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0018-guard-mallocopt-with-__GLIBC__.patch
rename to poky/meta/recipes-extended/ltp/ltp/0018-guard-mallocopt-with-__GLIBC__.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0020-getdents-define-getdents-getdents64-only-for-glibc.patch b/poky/meta/recipes-extended/ltp/ltp/0020-getdents-define-getdents-getdents64-only-for-glibc.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0020-getdents-define-getdents-getdents64-only-for-glibc.patch
rename to poky/meta/recipes-extended/ltp/ltp/0020-getdents-define-getdents-getdents64-only-for-glibc.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0021-Define-_GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch b/poky/meta/recipes-extended/ltp/ltp/0021-Define-_GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0021-Define-_GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch
rename to poky/meta/recipes-extended/ltp/ltp/0021-Define-_GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0023-ptrace-Use-int-instead-of-enum-__ptrace_request.patch b/poky/meta/recipes-extended/ltp/ltp/0023-ptrace-Use-int-instead-of-enum-__ptrace_request.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0023-ptrace-Use-int-instead-of-enum-__ptrace_request.patch
rename to poky/meta/recipes-extended/ltp/ltp/0023-ptrace-Use-int-instead-of-enum-__ptrace_request.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0024-rt_sigaction-rt_sigprocmark-Define-_GNU_SOURCE.patch b/poky/meta/recipes-extended/ltp/ltp/0024-rt_sigaction-rt_sigprocmark-Define-_GNU_SOURCE.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0024-rt_sigaction-rt_sigprocmark-Define-_GNU_SOURCE.patch
rename to poky/meta/recipes-extended/ltp/ltp/0024-rt_sigaction-rt_sigprocmark-Define-_GNU_SOURCE.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0026-crash01-Define-_GNU_SOURCE.patch b/poky/meta/recipes-extended/ltp/ltp/0026-crash01-Define-_GNU_SOURCE.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0026-crash01-Define-_GNU_SOURCE.patch
rename to poky/meta/recipes-extended/ltp/ltp/0026-crash01-Define-_GNU_SOURCE.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0028-rt_sigaction.h-Use-sighandler_t-instead-of-__sighand.patch b/poky/meta/recipes-extended/ltp/ltp/0028-rt_sigaction.h-Use-sighandler_t-instead-of-__sighand.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0028-rt_sigaction.h-Use-sighandler_t-instead-of-__sighand.patch
rename to poky/meta/recipes-extended/ltp/ltp/0028-rt_sigaction.h-Use-sighandler_t-instead-of-__sighand.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0034-periodic_output.patch b/poky/meta/recipes-extended/ltp/ltp/0034-periodic_output.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0034-periodic_output.patch
rename to poky/meta/recipes-extended/ltp/ltp/0034-periodic_output.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0035-fix-test_proc_kill-hang.patch b/poky/meta/recipes-extended/ltp/ltp/0035-fix-test_proc_kill-hang.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0035-fix-test_proc_kill-hang.patch
rename to poky/meta/recipes-extended/ltp/ltp/0035-fix-test_proc_kill-hang.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch b/poky/meta/recipes-extended/ltp/ltp/0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch
rename to poky/meta/recipes-extended/ltp/ltp/0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch b/poky/meta/recipes-extended/ltp/ltp/0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch
rename to poky/meta/recipes-extended/ltp/ltp/0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0040-safe_macros-make-is_fuse-return-zero-if-fs_type-is-N.patch b/poky/meta/recipes-extended/ltp/ltp/0040-safe_macros-make-is_fuse-return-zero-if-fs_type-is-N.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ltp/ltp/0040-safe_macros-make-is_fuse-return-zero-if-fs_type-is-N.patch
rename to poky/meta/recipes-extended/ltp/ltp/0040-safe_macros-make-is_fuse-return-zero-if-fs_type-is-N.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/ltp/ltp_20180118.bb b/poky/meta/recipes-extended/ltp/ltp_20180118.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/ltp/ltp_20180118.bb
rename to poky/meta/recipes-extended/ltp/ltp_20180118.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/lzip/lzip_1.19.bb b/poky/meta/recipes-extended/lzip/lzip_1.19.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/lzip/lzip_1.19.bb
rename to poky/meta/recipes-extended/lzip/lzip_1.19.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/man-db/man-db_2.8.1.bb b/poky/meta/recipes-extended/man-db/man-db_2.8.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/man-db/man-db_2.8.1.bb
rename to poky/meta/recipes-extended/man-db/man-db_2.8.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/man-pages/man-pages_4.14.bb b/poky/meta/recipes-extended/man-pages/man-pages_4.14.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/man-pages/man-pages_4.14.bb
rename to poky/meta/recipes-extended/man-pages/man-pages_4.14.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/mc/files/0001-mc-replace-perl-w-with-use-warnings.patch b/poky/meta/recipes-extended/mc/files/0001-mc-replace-perl-w-with-use-warnings.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/mc/files/0001-mc-replace-perl-w-with-use-warnings.patch
rename to poky/meta/recipes-extended/mc/files/0001-mc-replace-perl-w-with-use-warnings.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/mc/mc_4.8.20.bb b/poky/meta/recipes-extended/mc/mc_4.8.20.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/mc/mc_4.8.20.bb
rename to poky/meta/recipes-extended/mc/mc_4.8.20.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/mdadm/files/0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch b/poky/meta/recipes-extended/mdadm/files/0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/mdadm/files/0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch
rename to poky/meta/recipes-extended/mdadm/files/0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/mdadm/files/0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch b/poky/meta/recipes-extended/mdadm/files/0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/mdadm/files/0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch
rename to poky/meta/recipes-extended/mdadm/files/0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/mdadm/files/0001-include-sys-sysmacros.h-for-major-minor-defintions.patch b/poky/meta/recipes-extended/mdadm/files/0001-include-sys-sysmacros.h-for-major-minor-defintions.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/mdadm/files/0001-include-sys-sysmacros.h-for-major-minor-defintions.patch
rename to poky/meta/recipes-extended/mdadm/files/0001-include-sys-sysmacros.h-for-major-minor-defintions.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/mdadm/files/0001-mdadm-Add-Wimplicit-fallthrough-0-in-Makefile.patch b/poky/meta/recipes-extended/mdadm/files/0001-mdadm-Add-Wimplicit-fallthrough-0-in-Makefile.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/mdadm/files/0001-mdadm-Add-Wimplicit-fallthrough-0-in-Makefile.patch
rename to poky/meta/recipes-extended/mdadm/files/0001-mdadm-Add-Wimplicit-fallthrough-0-in-Makefile.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/mdadm/files/0001-mdadm.h-Undefine-dprintf-before-redefining.patch b/poky/meta/recipes-extended/mdadm/files/0001-mdadm.h-Undefine-dprintf-before-redefining.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/mdadm/files/0001-mdadm.h-Undefine-dprintf-before-redefining.patch
rename to poky/meta/recipes-extended/mdadm/files/0001-mdadm.h-Undefine-dprintf-before-redefining.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/mdadm/files/0002-mdadm-Specify-enough-length-when-write-to-buffer.patch b/poky/meta/recipes-extended/mdadm/files/0002-mdadm-Specify-enough-length-when-write-to-buffer.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/mdadm/files/0002-mdadm-Specify-enough-length-when-write-to-buffer.patch
rename to poky/meta/recipes-extended/mdadm/files/0002-mdadm-Specify-enough-length-when-write-to-buffer.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/mdadm/files/0003-Replace-snprintf-with-strncpy-at-some-places-to-avoi.patch b/poky/meta/recipes-extended/mdadm/files/0003-Replace-snprintf-with-strncpy-at-some-places-to-avoi.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/mdadm/files/0003-Replace-snprintf-with-strncpy-at-some-places-to-avoi.patch
rename to poky/meta/recipes-extended/mdadm/files/0003-Replace-snprintf-with-strncpy-at-some-places-to-avoi.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/mdadm/files/0004-mdadm-Forced-type-conversion-to-avoid-truncation.patch b/poky/meta/recipes-extended/mdadm/files/0004-mdadm-Forced-type-conversion-to-avoid-truncation.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/mdadm/files/0004-mdadm-Forced-type-conversion-to-avoid-truncation.patch
rename to poky/meta/recipes-extended/mdadm/files/0004-mdadm-Forced-type-conversion-to-avoid-truncation.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/mdadm/files/0005-Add-a-comment-to-indicate-valid-fallthrough.patch b/poky/meta/recipes-extended/mdadm/files/0005-Add-a-comment-to-indicate-valid-fallthrough.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/mdadm/files/0005-Add-a-comment-to-indicate-valid-fallthrough.patch
rename to poky/meta/recipes-extended/mdadm/files/0005-Add-a-comment-to-indicate-valid-fallthrough.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/mdadm/files/gcc-4.9.patch b/poky/meta/recipes-extended/mdadm/files/gcc-4.9.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/mdadm/files/gcc-4.9.patch
rename to poky/meta/recipes-extended/mdadm/files/gcc-4.9.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch b/poky/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch
rename to poky/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/mdadm/files/mdadm-fix-ptest-build-errors.patch b/poky/meta/recipes-extended/mdadm/files/mdadm-fix-ptest-build-errors.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/mdadm/files/mdadm-fix-ptest-build-errors.patch
rename to poky/meta/recipes-extended/mdadm/files/mdadm-fix-ptest-build-errors.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/mdadm/files/run-ptest b/poky/meta/recipes-extended/mdadm/files/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/mdadm/files/run-ptest
rename to poky/meta/recipes-extended/mdadm/files/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-extended/mdadm/mdadm_4.0.bb b/poky/meta/recipes-extended/mdadm/mdadm_4.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/mdadm/mdadm_4.0.bb
rename to poky/meta/recipes-extended/mdadm/mdadm_4.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/mingetty/mingetty_1.08.bb b/poky/meta/recipes-extended/mingetty/mingetty_1.08.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/mingetty/mingetty_1.08.bb
rename to poky/meta/recipes-extended/mingetty/mingetty_1.08.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/minicom/minicom/0001-Fix-build-issus-surfaced-due-to-musl.patch b/poky/meta/recipes-extended/minicom/minicom/0001-Fix-build-issus-surfaced-due-to-musl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/minicom/minicom/0001-Fix-build-issus-surfaced-due-to-musl.patch
rename to poky/meta/recipes-extended/minicom/minicom/0001-Fix-build-issus-surfaced-due-to-musl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/minicom/minicom/0001-fix-minicom-h-v-return-value-is-not-0.patch b/poky/meta/recipes-extended/minicom/minicom/0001-fix-minicom-h-v-return-value-is-not-0.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/minicom/minicom/0001-fix-minicom-h-v-return-value-is-not-0.patch
rename to poky/meta/recipes-extended/minicom/minicom/0001-fix-minicom-h-v-return-value-is-not-0.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/minicom/minicom/allow.to.disable.lockdev.patch b/poky/meta/recipes-extended/minicom/minicom/allow.to.disable.lockdev.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/minicom/minicom/allow.to.disable.lockdev.patch
rename to poky/meta/recipes-extended/minicom/minicom/allow.to.disable.lockdev.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/minicom/minicom_2.7.1.bb b/poky/meta/recipes-extended/minicom/minicom_2.7.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/minicom/minicom_2.7.1.bb
rename to poky/meta/recipes-extended/minicom/minicom_2.7.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/mktemp/files/disable-strip.patch b/poky/meta/recipes-extended/mktemp/files/disable-strip.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/mktemp/files/disable-strip.patch
rename to poky/meta/recipes-extended/mktemp/files/disable-strip.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/mktemp/files/fix-parallel-make.patch b/poky/meta/recipes-extended/mktemp/files/fix-parallel-make.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/mktemp/files/fix-parallel-make.patch
rename to poky/meta/recipes-extended/mktemp/files/fix-parallel-make.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/mktemp/mktemp_1.7.bb b/poky/meta/recipes-extended/mktemp/mktemp_1.7.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/mktemp/mktemp_1.7.bb
rename to poky/meta/recipes-extended/mktemp/mktemp_1.7.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/msmtp/msmtp_1.6.6.bb b/poky/meta/recipes-extended/msmtp/msmtp_1.6.6.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/msmtp/msmtp_1.6.6.bb
rename to poky/meta/recipes-extended/msmtp/msmtp_1.6.6.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/net-tools/net-tools/0001-lib-inet6.c-INET6_rresolve-various-fixes.patch b/poky/meta/recipes-extended/net-tools/net-tools/0001-lib-inet6.c-INET6_rresolve-various-fixes.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/net-tools/net-tools/0001-lib-inet6.c-INET6_rresolve-various-fixes.patch
rename to poky/meta/recipes-extended/net-tools/net-tools/0001-lib-inet6.c-INET6_rresolve-various-fixes.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/net-tools/net-tools/ifconfig-interface-0-del-IP-will-remove-the-aliased-.patch b/poky/meta/recipes-extended/net-tools/net-tools/ifconfig-interface-0-del-IP-will-remove-the-aliased-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/net-tools/net-tools/ifconfig-interface-0-del-IP-will-remove-the-aliased-.patch
rename to poky/meta/recipes-extended/net-tools/net-tools/ifconfig-interface-0-del-IP-will-remove-the-aliased-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/net-tools/net-tools/musl-fixes.patch b/poky/meta/recipes-extended/net-tools/net-tools/musl-fixes.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/net-tools/net-tools/musl-fixes.patch
rename to poky/meta/recipes-extended/net-tools/net-tools/musl-fixes.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/net-tools/net-tools/net-tools-1.60-sctp1.patch b/poky/meta/recipes-extended/net-tools/net-tools/net-tools-1.60-sctp1.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/net-tools/net-tools/net-tools-1.60-sctp1.patch
rename to poky/meta/recipes-extended/net-tools/net-tools/net-tools-1.60-sctp1.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/net-tools/net-tools/net-tools-1.60-sctp2-quiet.patch b/poky/meta/recipes-extended/net-tools/net-tools/net-tools-1.60-sctp2-quiet.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/net-tools/net-tools/net-tools-1.60-sctp2-quiet.patch
rename to poky/meta/recipes-extended/net-tools/net-tools/net-tools-1.60-sctp2-quiet.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/net-tools/net-tools/net-tools-1.60-sctp3-addrs.patch b/poky/meta/recipes-extended/net-tools/net-tools/net-tools-1.60-sctp3-addrs.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/net-tools/net-tools/net-tools-1.60-sctp3-addrs.patch
rename to poky/meta/recipes-extended/net-tools/net-tools/net-tools-1.60-sctp3-addrs.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/net-tools/net-tools/net-tools-config.h b/poky/meta/recipes-extended/net-tools/net-tools/net-tools-config.h
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/net-tools/net-tools/net-tools-config.h
rename to poky/meta/recipes-extended/net-tools/net-tools/net-tools-config.h
diff --git a/import-layers/yocto-poky/meta/recipes-extended/net-tools/net-tools/net-tools-config.make b/poky/meta/recipes-extended/net-tools/net-tools/net-tools-config.make
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/net-tools/net-tools/net-tools-config.make
rename to poky/meta/recipes-extended/net-tools/net-tools/net-tools-config.make
diff --git a/import-layers/yocto-poky/meta/recipes-extended/net-tools/net-tools/net-tools-fix-building-with-linux-4.8.patch b/poky/meta/recipes-extended/net-tools/net-tools/net-tools-fix-building-with-linux-4.8.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/net-tools/net-tools/net-tools-fix-building-with-linux-4.8.patch
rename to poky/meta/recipes-extended/net-tools/net-tools/net-tools-fix-building-with-linux-4.8.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/net-tools/net-tools_1.60-26.bb b/poky/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
rename to poky/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/newt/files/0001-detect-gold-as-GNU-linker-too.patch b/poky/meta/recipes-extended/newt/files/0001-detect-gold-as-GNU-linker-too.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/newt/files/0001-detect-gold-as-GNU-linker-too.patch
rename to poky/meta/recipes-extended/newt/files/0001-detect-gold-as-GNU-linker-too.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/newt/files/Makefile.in-Add-tinfo-library-to-the-linking-librari.patch b/poky/meta/recipes-extended/newt/files/Makefile.in-Add-tinfo-library-to-the-linking-librari.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/newt/files/Makefile.in-Add-tinfo-library-to-the-linking-librari.patch
rename to poky/meta/recipes-extended/newt/files/Makefile.in-Add-tinfo-library-to-the-linking-librari.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/newt/files/cross_ar.patch b/poky/meta/recipes-extended/newt/files/cross_ar.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/newt/files/cross_ar.patch
rename to poky/meta/recipes-extended/newt/files/cross_ar.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/newt/files/fix_SHAREDDIR.patch b/poky/meta/recipes-extended/newt/files/fix_SHAREDDIR.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/newt/files/fix_SHAREDDIR.patch
rename to poky/meta/recipes-extended/newt/files/fix_SHAREDDIR.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/newt/files/pie-flags.patch b/poky/meta/recipes-extended/newt/files/pie-flags.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/newt/files/pie-flags.patch
rename to poky/meta/recipes-extended/newt/files/pie-flags.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/newt/libnewt-python_0.52.20.bb b/poky/meta/recipes-extended/newt/libnewt-python_0.52.20.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/newt/libnewt-python_0.52.20.bb
rename to poky/meta/recipes-extended/newt/libnewt-python_0.52.20.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/newt/libnewt_0.52.20.bb b/poky/meta/recipes-extended/newt/libnewt_0.52.20.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/newt/libnewt_0.52.20.bb
rename to poky/meta/recipes-extended/newt/libnewt_0.52.20.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb b/poky/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb
rename to poky/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/poky/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
rename to poky/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/pam/libpam/0001-Add-support-for-defining-missing-funcitonality.patch b/poky/meta/recipes-extended/pam/libpam/0001-Add-support-for-defining-missing-funcitonality.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/pam/libpam/0001-Add-support-for-defining-missing-funcitonality.patch
rename to poky/meta/recipes-extended/pam/libpam/0001-Add-support-for-defining-missing-funcitonality.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/pam/libpam/99_pam b/poky/meta/recipes-extended/pam/libpam/99_pam
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/pam/libpam/99_pam
rename to poky/meta/recipes-extended/pam/libpam/99_pam
diff --git a/import-layers/yocto-poky/meta/recipes-extended/pam/libpam/crypt_configure.patch b/poky/meta/recipes-extended/pam/libpam/crypt_configure.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/pam/libpam/crypt_configure.patch
rename to poky/meta/recipes-extended/pam/libpam/crypt_configure.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/pam/libpam/fixsepbuild.patch b/poky/meta/recipes-extended/pam/libpam/fixsepbuild.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/pam/libpam/fixsepbuild.patch
rename to poky/meta/recipes-extended/pam/libpam/fixsepbuild.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/pam/libpam/include_paths_header.patch b/poky/meta/recipes-extended/pam/libpam/include_paths_header.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/pam/libpam/include_paths_header.patch
rename to poky/meta/recipes-extended/pam/libpam/include_paths_header.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/pam/libpam/libpam-xtests-remove-bash-dependency.patch b/poky/meta/recipes-extended/pam/libpam/libpam-xtests-remove-bash-dependency.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/pam/libpam/libpam-xtests-remove-bash-dependency.patch
rename to poky/meta/recipes-extended/pam/libpam/libpam-xtests-remove-bash-dependency.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/pam/libpam/libpam-xtests.patch b/poky/meta/recipes-extended/pam/libpam/libpam-xtests.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/pam/libpam/libpam-xtests.patch
rename to poky/meta/recipes-extended/pam/libpam/libpam-xtests.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/pam/libpam/pam-security-abstract-securetty-handling.patch b/poky/meta/recipes-extended/pam/libpam/pam-security-abstract-securetty-handling.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/pam/libpam/pam-security-abstract-securetty-handling.patch
rename to poky/meta/recipes-extended/pam/libpam/pam-security-abstract-securetty-handling.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/pam/libpam/pam-unix-nullok-secure.patch b/poky/meta/recipes-extended/pam/libpam/pam-unix-nullok-secure.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/pam/libpam/pam-unix-nullok-secure.patch
rename to poky/meta/recipes-extended/pam/libpam/pam-unix-nullok-secure.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/pam/libpam/pam.d/common-account b/poky/meta/recipes-extended/pam/libpam/pam.d/common-account
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/pam/libpam/pam.d/common-account
rename to poky/meta/recipes-extended/pam/libpam/pam.d/common-account
diff --git a/import-layers/yocto-poky/meta/recipes-extended/pam/libpam/pam.d/common-auth b/poky/meta/recipes-extended/pam/libpam/pam.d/common-auth
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/pam/libpam/pam.d/common-auth
rename to poky/meta/recipes-extended/pam/libpam/pam.d/common-auth
diff --git a/import-layers/yocto-poky/meta/recipes-extended/pam/libpam/pam.d/common-password b/poky/meta/recipes-extended/pam/libpam/pam.d/common-password
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/pam/libpam/pam.d/common-password
rename to poky/meta/recipes-extended/pam/libpam/pam.d/common-password
diff --git a/import-layers/yocto-poky/meta/recipes-extended/pam/libpam/pam.d/common-session b/poky/meta/recipes-extended/pam/libpam/pam.d/common-session
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/pam/libpam/pam.d/common-session
rename to poky/meta/recipes-extended/pam/libpam/pam.d/common-session
diff --git a/import-layers/yocto-poky/meta/recipes-extended/pam/libpam/pam.d/common-session-noninteractive b/poky/meta/recipes-extended/pam/libpam/pam.d/common-session-noninteractive
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/pam/libpam/pam.d/common-session-noninteractive
rename to poky/meta/recipes-extended/pam/libpam/pam.d/common-session-noninteractive
diff --git a/import-layers/yocto-poky/meta/recipes-extended/pam/libpam/pam.d/other b/poky/meta/recipes-extended/pam/libpam/pam.d/other
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/pam/libpam/pam.d/other
rename to poky/meta/recipes-extended/pam/libpam/pam.d/other
diff --git a/import-layers/yocto-poky/meta/recipes-extended/pam/libpam_1.3.0.bb b/poky/meta/recipes-extended/pam/libpam_1.3.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/pam/libpam_1.3.0.bb
rename to poky/meta/recipes-extended/pam/libpam_1.3.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/parted/files/0001-Include-fcntl.h-in-platform_defs.h.patch b/poky/meta/recipes-extended/parted/files/0001-Include-fcntl.h-in-platform_defs.h.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/parted/files/0001-Include-fcntl.h-in-platform_defs.h.patch
rename to poky/meta/recipes-extended/parted/files/0001-Include-fcntl.h-in-platform_defs.h.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/parted/files/0001-Move-python-helper-scripts-used-only-in-tests-to-Pyt.patch b/poky/meta/recipes-extended/parted/files/0001-Move-python-helper-scripts-used-only-in-tests-to-Pyt.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/parted/files/0001-Move-python-helper-scripts-used-only-in-tests-to-Pyt.patch
rename to poky/meta/recipes-extended/parted/files/0001-Move-python-helper-scripts-used-only-in-tests-to-Pyt.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/parted/files/0001-Unset-need_charset_alias-when-building-for-musl.patch b/poky/meta/recipes-extended/parted/files/0001-Unset-need_charset_alias-when-building-for-musl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/parted/files/0001-Unset-need_charset_alias-when-building-for-musl.patch
rename to poky/meta/recipes-extended/parted/files/0001-Unset-need_charset_alias-when-building-for-musl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/parted/files/0001-libparted-Use-read-only-when-probing-devices-on-linu.patch b/poky/meta/recipes-extended/parted/files/0001-libparted-Use-read-only-when-probing-devices-on-linu.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/parted/files/0001-libparted-Use-read-only-when-probing-devices-on-linu.patch
rename to poky/meta/recipes-extended/parted/files/0001-libparted-Use-read-only-when-probing-devices-on-linu.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/parted/files/0002-libparted_fs_resize-link-against-libuuid-explicitly-.patch b/poky/meta/recipes-extended/parted/files/0002-libparted_fs_resize-link-against-libuuid-explicitly-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/parted/files/0002-libparted_fs_resize-link-against-libuuid-explicitly-.patch
rename to poky/meta/recipes-extended/parted/files/0002-libparted_fs_resize-link-against-libuuid-explicitly-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/parted/files/Makefile b/poky/meta/recipes-extended/parted/files/Makefile
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/parted/files/Makefile
rename to poky/meta/recipes-extended/parted/files/Makefile
diff --git a/import-layers/yocto-poky/meta/recipes-extended/parted/files/fix-compile-failure-while-dis.patch b/poky/meta/recipes-extended/parted/files/fix-compile-failure-while-dis.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/parted/files/fix-compile-failure-while-dis.patch
rename to poky/meta/recipes-extended/parted/files/fix-compile-failure-while-dis.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/parted/files/fix-doc-mandir.patch b/poky/meta/recipes-extended/parted/files/fix-doc-mandir.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/parted/files/fix-doc-mandir.patch
rename to poky/meta/recipes-extended/parted/files/fix-doc-mandir.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/parted/files/no_check.patch b/poky/meta/recipes-extended/parted/files/no_check.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/parted/files/no_check.patch
rename to poky/meta/recipes-extended/parted/files/no_check.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/parted/files/run-ptest b/poky/meta/recipes-extended/parted/files/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/parted/files/run-ptest
rename to poky/meta/recipes-extended/parted/files/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-extended/parted/files/syscalls.patch b/poky/meta/recipes-extended/parted/files/syscalls.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/parted/files/syscalls.patch
rename to poky/meta/recipes-extended/parted/files/syscalls.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/parted/parted/parted-3.2-sysmacros.patch b/poky/meta/recipes-extended/parted/parted/parted-3.2-sysmacros.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/parted/parted/parted-3.2-sysmacros.patch
rename to poky/meta/recipes-extended/parted/parted/parted-3.2-sysmacros.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/parted/parted_3.2.bb b/poky/meta/recipes-extended/parted/parted_3.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/parted/parted_3.2.bb
rename to poky/meta/recipes-extended/parted/parted_3.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/pbzip2/pbzip2_1.1.13.bb b/poky/meta/recipes-extended/pbzip2/pbzip2_1.1.13.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/pbzip2/pbzip2_1.1.13.bb
rename to poky/meta/recipes-extended/pbzip2/pbzip2_1.1.13.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/perl/libconvert-asn1-perl_0.27.bb b/poky/meta/recipes-extended/perl/libconvert-asn1-perl_0.27.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/perl/libconvert-asn1-perl_0.27.bb
rename to poky/meta/recipes-extended/perl/libconvert-asn1-perl_0.27.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/perl/libtimedate-perl_2.30.bb b/poky/meta/recipes-extended/perl/libtimedate-perl_2.30.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/perl/libtimedate-perl_2.30.bb
rename to poky/meta/recipes-extended/perl/libtimedate-perl_2.30.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/perl/libxml-namespacesupport-perl_1.12.bb b/poky/meta/recipes-extended/perl/libxml-namespacesupport-perl_1.12.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/perl/libxml-namespacesupport-perl_1.12.bb
rename to poky/meta/recipes-extended/perl/libxml-namespacesupport-perl_1.12.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/perl/libxml-sax-base-perl_1.09.bb b/poky/meta/recipes-extended/perl/libxml-sax-base-perl_1.09.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/perl/libxml-sax-base-perl_1.09.bb
rename to poky/meta/recipes-extended/perl/libxml-sax-base-perl_1.09.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/perl/libxml-sax-perl_0.99.bb b/poky/meta/recipes-extended/perl/libxml-sax-perl_0.99.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/perl/libxml-sax-perl_0.99.bb
rename to poky/meta/recipes-extended/perl/libxml-sax-perl_0.99.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/pigz/pigz_2.4.bb b/poky/meta/recipes-extended/pigz/pigz_2.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/pigz/pigz_2.4.bb
rename to poky/meta/recipes-extended/pigz/pigz_2.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/pixz/pixz/0001-configure-Detect-headers-before-using-them.patch b/poky/meta/recipes-extended/pixz/pixz/0001-configure-Detect-headers-before-using-them.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/pixz/pixz/0001-configure-Detect-headers-before-using-them.patch
rename to poky/meta/recipes-extended/pixz/pixz/0001-configure-Detect-headers-before-using-them.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/pixz/pixz/0002-endian-Use-macro-bswap_64-instead-of-__bswap_64.patch b/poky/meta/recipes-extended/pixz/pixz/0002-endian-Use-macro-bswap_64-instead-of-__bswap_64.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/pixz/pixz/0002-endian-Use-macro-bswap_64-instead-of-__bswap_64.patch
rename to poky/meta/recipes-extended/pixz/pixz/0002-endian-Use-macro-bswap_64-instead-of-__bswap_64.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/pixz/pixz/936d8068ae19d95260d3058f41dd6cf718101cd6.patch b/poky/meta/recipes-extended/pixz/pixz/936d8068ae19d95260d3058f41dd6cf718101cd6.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/pixz/pixz/936d8068ae19d95260d3058f41dd6cf718101cd6.patch
rename to poky/meta/recipes-extended/pixz/pixz/936d8068ae19d95260d3058f41dd6cf718101cd6.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/pixz/pixz_1.0.6.bb b/poky/meta/recipes-extended/pixz/pixz_1.0.6.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/pixz/pixz_1.0.6.bb
rename to poky/meta/recipes-extended/pixz/pixz_1.0.6.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/procps/procps/sysctl.conf b/poky/meta/recipes-extended/procps/procps/sysctl.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/procps/procps/sysctl.conf
rename to poky/meta/recipes-extended/procps/procps/sysctl.conf
diff --git a/import-layers/yocto-poky/meta/recipes-extended/procps/procps_3.3.12.bb b/poky/meta/recipes-extended/procps/procps_3.3.12.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/procps/procps_3.3.12.bb
rename to poky/meta/recipes-extended/procps/procps_3.3.12.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/psmisc/psmisc.inc b/poky/meta/recipes-extended/psmisc/psmisc.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/psmisc/psmisc.inc
rename to poky/meta/recipes-extended/psmisc/psmisc.inc
diff --git a/import-layers/yocto-poky/meta/recipes-extended/psmisc/psmisc/0001-Makefile.am-create-src-directory-before-attempting-t.patch b/poky/meta/recipes-extended/psmisc/psmisc/0001-Makefile.am-create-src-directory-before-attempting-t.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/psmisc/psmisc/0001-Makefile.am-create-src-directory-before-attempting-t.patch
rename to poky/meta/recipes-extended/psmisc/psmisc/0001-Makefile.am-create-src-directory-before-attempting-t.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch b/poky/meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch
rename to poky/meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/psmisc/psmisc_23.0.bb b/poky/meta/recipes-extended/psmisc/psmisc_23.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/psmisc/psmisc_23.0.bb
rename to poky/meta/recipes-extended/psmisc/psmisc_23.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/quota/quota/fcntl.patch b/poky/meta/recipes-extended/quota/quota/fcntl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/quota/quota/fcntl.patch
rename to poky/meta/recipes-extended/quota/quota/fcntl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/quota/quota/remove_non_posix_types.patch b/poky/meta/recipes-extended/quota/quota/remove_non_posix_types.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/quota/quota/remove_non_posix_types.patch
rename to poky/meta/recipes-extended/quota/quota/remove_non_posix_types.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/quota/quota/replace_getrpcbynumber_r.patch b/poky/meta/recipes-extended/quota/quota/replace_getrpcbynumber_r.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/quota/quota/replace_getrpcbynumber_r.patch
rename to poky/meta/recipes-extended/quota/quota/replace_getrpcbynumber_r.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/quota/quota_4.04.bb b/poky/meta/recipes-extended/quota/quota_4.04.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/quota/quota_4.04.bb
rename to poky/meta/recipes-extended/quota/quota_4.04.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/0001-rpcbind-pair-all-svc_getargs-calls-with-svc_freeargs.patch b/poky/meta/recipes-extended/rpcbind/rpcbind/0001-rpcbind-pair-all-svc_getargs-calls-with-svc_freeargs.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/0001-rpcbind-pair-all-svc_getargs-calls-with-svc_freeargs.patch
rename to poky/meta/recipes-extended/rpcbind/rpcbind/0001-rpcbind-pair-all-svc_getargs-calls-with-svc_freeargs.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/init.d b/poky/meta/recipes-extended/rpcbind/rpcbind/init.d
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/init.d
rename to poky/meta/recipes-extended/rpcbind/rpcbind/init.d
diff --git a/import-layers/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/pmapproc_dump-Fixed-typo-in-memory-leak-patch.patch b/poky/meta/recipes-extended/rpcbind/rpcbind/pmapproc_dump-Fixed-typo-in-memory-leak-patch.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/pmapproc_dump-Fixed-typo-in-memory-leak-patch.patch
rename to poky/meta/recipes-extended/rpcbind/rpcbind/pmapproc_dump-Fixed-typo-in-memory-leak-patch.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/rpcbind.conf b/poky/meta/recipes-extended/rpcbind/rpcbind/rpcbind.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/rpcbind.conf
rename to poky/meta/recipes-extended/rpcbind/rpcbind/rpcbind.conf
diff --git a/import-layers/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service b/poky/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service
rename to poky/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service
diff --git a/import-layers/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/rpcbind.socket b/poky/meta/recipes-extended/rpcbind/rpcbind/rpcbind.socket
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/rpcbind.socket
rename to poky/meta/recipes-extended/rpcbind/rpcbind/rpcbind.socket
diff --git a/import-layers/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/rpcbproc_callit_com-Stop-freeing-a-static-pointer.patch b/poky/meta/recipes-extended/rpcbind/rpcbind/rpcbproc_callit_com-Stop-freeing-a-static-pointer.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/rpcbind/rpcbind/rpcbproc_callit_com-Stop-freeing-a-static-pointer.patch
rename to poky/meta/recipes-extended/rpcbind/rpcbind/rpcbproc_callit_com-Stop-freeing-a-static-pointer.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb b/poky/meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb
rename to poky/meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/screen/screen/0001-configure.ac-fix-configure-failed-while-build-dir-ha.patch b/poky/meta/recipes-extended/screen/screen/0001-configure.ac-fix-configure-failed-while-build-dir-ha.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/screen/screen/0001-configure.ac-fix-configure-failed-while-build-dir-ha.patch
rename to poky/meta/recipes-extended/screen/screen/0001-configure.ac-fix-configure-failed-while-build-dir-ha.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch b/poky/meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch
rename to poky/meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch b/poky/meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch
rename to poky/meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/screen/screen/Avoid-mis-identifying-systems-as-SVR4.patch b/poky/meta/recipes-extended/screen/screen/Avoid-mis-identifying-systems-as-SVR4.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/screen/screen/Avoid-mis-identifying-systems-as-SVR4.patch
rename to poky/meta/recipes-extended/screen/screen/Avoid-mis-identifying-systems-as-SVR4.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/screen/screen/Provide-cross-compile-alternatives-for-AC_TRY_RUN.patch b/poky/meta/recipes-extended/screen/screen/Provide-cross-compile-alternatives-for-AC_TRY_RUN.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/screen/screen/Provide-cross-compile-alternatives-for-AC_TRY_RUN.patch
rename to poky/meta/recipes-extended/screen/screen/Provide-cross-compile-alternatives-for-AC_TRY_RUN.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/screen/screen/Remove-redundant-compiler-sanity-checks.patch b/poky/meta/recipes-extended/screen/screen/Remove-redundant-compiler-sanity-checks.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/screen/screen/Remove-redundant-compiler-sanity-checks.patch
rename to poky/meta/recipes-extended/screen/screen/Remove-redundant-compiler-sanity-checks.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/screen/screen/Skip-host-file-system-checks-when-cross-compiling.patch b/poky/meta/recipes-extended/screen/screen/Skip-host-file-system-checks-when-cross-compiling.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/screen/screen/Skip-host-file-system-checks-when-cross-compiling.patch
rename to poky/meta/recipes-extended/screen/screen/Skip-host-file-system-checks-when-cross-compiling.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/screen/screen/screen.pam b/poky/meta/recipes-extended/screen/screen/screen.pam
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/screen/screen/screen.pam
rename to poky/meta/recipes-extended/screen/screen/screen.pam
diff --git a/import-layers/yocto-poky/meta/recipes-extended/screen/screen_4.6.2.bb b/poky/meta/recipes-extended/screen/screen_4.6.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/screen/screen_4.6.2.bb
rename to poky/meta/recipes-extended/screen/screen_4.6.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/sed/sed-4.2.2/0001-Unset-need_charset_alias-when-building-for-musl.patch b/poky/meta/recipes-extended/sed/sed-4.2.2/0001-Unset-need_charset_alias-when-building-for-musl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/sed/sed-4.2.2/0001-Unset-need_charset_alias-when-building-for-musl.patch
rename to poky/meta/recipes-extended/sed/sed-4.2.2/0001-Unset-need_charset_alias-when-building-for-musl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/sed/sed-4.2.2/run-ptest b/poky/meta/recipes-extended/sed/sed-4.2.2/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/sed/sed-4.2.2/run-ptest
rename to poky/meta/recipes-extended/sed/sed-4.2.2/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-extended/sed/sed-4.2.2/sed-add-ptest.patch b/poky/meta/recipes-extended/sed/sed-4.2.2/sed-add-ptest.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/sed/sed-4.2.2/sed-add-ptest.patch
rename to poky/meta/recipes-extended/sed/sed-4.2.2/sed-add-ptest.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/sed/sed_4.2.2.bb b/poky/meta/recipes-extended/sed/sed_4.2.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/sed/sed_4.2.2.bb
rename to poky/meta/recipes-extended/sed/sed_4.2.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch b/poky/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch
rename to poky/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/shadow/files/0001-Do-not-read-login.defs-before-doing-chroot.patch b/poky/meta/recipes-extended/shadow/files/0001-Do-not-read-login.defs-before-doing-chroot.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/shadow/files/0001-Do-not-read-login.defs-before-doing-chroot.patch
rename to poky/meta/recipes-extended/shadow/files/0001-Do-not-read-login.defs-before-doing-chroot.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/shadow/files/0001-shadow-CVE-2017-12424 b/poky/meta/recipes-extended/shadow/files/0001-shadow-CVE-2017-12424
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/shadow/files/0001-shadow-CVE-2017-12424
rename to poky/meta/recipes-extended/shadow/files/0001-shadow-CVE-2017-12424
diff --git a/import-layers/yocto-poky/meta/recipes-extended/shadow/files/0001-useradd-copy-extended-attributes-of-home.patch b/poky/meta/recipes-extended/shadow/files/0001-useradd-copy-extended-attributes-of-home.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/shadow/files/0001-useradd-copy-extended-attributes-of-home.patch
rename to poky/meta/recipes-extended/shadow/files/0001-useradd-copy-extended-attributes-of-home.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patch b/poky/meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patch
rename to poky/meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/shadow/files/allow-for-setting-password-in-clear-text.patch b/poky/meta/recipes-extended/shadow/files/allow-for-setting-password-in-clear-text.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/shadow/files/allow-for-setting-password-in-clear-text.patch
rename to poky/meta/recipes-extended/shadow/files/allow-for-setting-password-in-clear-text.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/shadow/files/check_size_of_uid_t_and_gid_t_using_AC_CHECK_SIZEOF.patch b/poky/meta/recipes-extended/shadow/files/check_size_of_uid_t_and_gid_t_using_AC_CHECK_SIZEOF.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/shadow/files/check_size_of_uid_t_and_gid_t_using_AC_CHECK_SIZEOF.patch
rename to poky/meta/recipes-extended/shadow/files/check_size_of_uid_t_and_gid_t_using_AC_CHECK_SIZEOF.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch b/poky/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch
rename to poky/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/shadow/files/fix-installation-failure-with-subids-disabled.patch b/poky/meta/recipes-extended/shadow/files/fix-installation-failure-with-subids-disabled.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/shadow/files/fix-installation-failure-with-subids-disabled.patch
rename to poky/meta/recipes-extended/shadow/files/fix-installation-failure-with-subids-disabled.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/shadow/files/login.defs_shadow-sysroot b/poky/meta/recipes-extended/shadow/files/login.defs_shadow-sysroot
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/shadow/files/login.defs_shadow-sysroot
rename to poky/meta/recipes-extended/shadow/files/login.defs_shadow-sysroot
diff --git a/import-layers/yocto-poky/meta/recipes-extended/shadow/files/login_defs_pam.sed b/poky/meta/recipes-extended/shadow/files/login_defs_pam.sed
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/shadow/files/login_defs_pam.sed
rename to poky/meta/recipes-extended/shadow/files/login_defs_pam.sed
diff --git a/import-layers/yocto-poky/meta/recipes-extended/shadow/files/pam.d/chfn b/poky/meta/recipes-extended/shadow/files/pam.d/chfn
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/shadow/files/pam.d/chfn
rename to poky/meta/recipes-extended/shadow/files/pam.d/chfn
diff --git a/import-layers/yocto-poky/meta/recipes-extended/shadow/files/pam.d/chpasswd b/poky/meta/recipes-extended/shadow/files/pam.d/chpasswd
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/shadow/files/pam.d/chpasswd
rename to poky/meta/recipes-extended/shadow/files/pam.d/chpasswd
diff --git a/import-layers/yocto-poky/meta/recipes-extended/shadow/files/pam.d/chsh b/poky/meta/recipes-extended/shadow/files/pam.d/chsh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/shadow/files/pam.d/chsh
rename to poky/meta/recipes-extended/shadow/files/pam.d/chsh
diff --git a/import-layers/yocto-poky/meta/recipes-extended/shadow/files/pam.d/login b/poky/meta/recipes-extended/shadow/files/pam.d/login
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/shadow/files/pam.d/login
rename to poky/meta/recipes-extended/shadow/files/pam.d/login
diff --git a/import-layers/yocto-poky/meta/recipes-extended/shadow/files/pam.d/newusers b/poky/meta/recipes-extended/shadow/files/pam.d/newusers
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/shadow/files/pam.d/newusers
rename to poky/meta/recipes-extended/shadow/files/pam.d/newusers
diff --git a/import-layers/yocto-poky/meta/recipes-extended/shadow/files/pam.d/passwd b/poky/meta/recipes-extended/shadow/files/pam.d/passwd
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/shadow/files/pam.d/passwd
rename to poky/meta/recipes-extended/shadow/files/pam.d/passwd
diff --git a/import-layers/yocto-poky/meta/recipes-extended/shadow/files/pam.d/su b/poky/meta/recipes-extended/shadow/files/pam.d/su
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/shadow/files/pam.d/su
rename to poky/meta/recipes-extended/shadow/files/pam.d/su
diff --git a/import-layers/yocto-poky/meta/recipes-extended/shadow/files/securetty b/poky/meta/recipes-extended/shadow/files/securetty
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/shadow/files/securetty
rename to poky/meta/recipes-extended/shadow/files/securetty
diff --git a/import-layers/yocto-poky/meta/recipes-extended/shadow/files/shadow-4.1.3-dots-in-usernames.patch b/poky/meta/recipes-extended/shadow/files/shadow-4.1.3-dots-in-usernames.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/shadow/files/shadow-4.1.3-dots-in-usernames.patch
rename to poky/meta/recipes-extended/shadow/files/shadow-4.1.3-dots-in-usernames.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/shadow/files/shadow-relaxed-usernames.patch b/poky/meta/recipes-extended/shadow/files/shadow-relaxed-usernames.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/shadow/files/shadow-relaxed-usernames.patch
rename to poky/meta/recipes-extended/shadow/files/shadow-relaxed-usernames.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch b/poky/meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch
rename to poky/meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/shadow/files/usermod-fix-compilation-failure-with-subids-disabled.patch b/poky/meta/recipes-extended/shadow/files/usermod-fix-compilation-failure-with-subids-disabled.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/shadow/files/usermod-fix-compilation-failure-with-subids-disabled.patch
rename to poky/meta/recipes-extended/shadow/files/usermod-fix-compilation-failure-with-subids-disabled.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/shadow/shadow-securetty_4.2.1.bb b/poky/meta/recipes-extended/shadow/shadow-securetty_4.2.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/shadow/shadow-securetty_4.2.1.bb
rename to poky/meta/recipes-extended/shadow/shadow-securetty_4.2.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/shadow/shadow-sysroot_4.2.1.bb b/poky/meta/recipes-extended/shadow/shadow-sysroot_4.2.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/shadow/shadow-sysroot_4.2.1.bb
rename to poky/meta/recipes-extended/shadow/shadow-sysroot_4.2.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/shadow/shadow.inc b/poky/meta/recipes-extended/shadow/shadow.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/shadow/shadow.inc
rename to poky/meta/recipes-extended/shadow/shadow.inc
diff --git a/import-layers/yocto-poky/meta/recipes-extended/shadow/shadow_4.2.1.bb b/poky/meta/recipes-extended/shadow/shadow_4.2.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/shadow/shadow_4.2.1.bb
rename to poky/meta/recipes-extended/shadow/shadow_4.2.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/slang/slang/dont-link-to-host.patch b/poky/meta/recipes-extended/slang/slang/dont-link-to-host.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/slang/slang/dont-link-to-host.patch
rename to poky/meta/recipes-extended/slang/slang/dont-link-to-host.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/slang/slang/no-x.patch b/poky/meta/recipes-extended/slang/slang/no-x.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/slang/slang/no-x.patch
rename to poky/meta/recipes-extended/slang/slang/no-x.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/slang/slang/run-ptest b/poky/meta/recipes-extended/slang/slang/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/slang/slang/run-ptest
rename to poky/meta/recipes-extended/slang/slang/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-extended/slang/slang/terminfo_fixes.patch b/poky/meta/recipes-extended/slang/slang/terminfo_fixes.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/slang/slang/terminfo_fixes.patch
rename to poky/meta/recipes-extended/slang/slang/terminfo_fixes.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/slang/slang/test-add-output-in-the-format-result-testname.patch b/poky/meta/recipes-extended/slang/slang/test-add-output-in-the-format-result-testname.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/slang/slang/test-add-output-in-the-format-result-testname.patch
rename to poky/meta/recipes-extended/slang/slang/test-add-output-in-the-format-result-testname.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/slang/slang_2.3.2.bb b/poky/meta/recipes-extended/slang/slang_2.3.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/slang/slang_2.3.2.bb
rename to poky/meta/recipes-extended/slang/slang_2.3.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/stress/files/texinfo.patch b/poky/meta/recipes-extended/stress/files/texinfo.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/stress/files/texinfo.patch
rename to poky/meta/recipes-extended/stress/files/texinfo.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/stress/stress_1.0.4.bb b/poky/meta/recipes-extended/stress/stress_1.0.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/stress/stress_1.0.4.bb
rename to poky/meta/recipes-extended/stress/stress_1.0.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/sudo/files/sudo.pam b/poky/meta/recipes-extended/sudo/files/sudo.pam
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/sudo/files/sudo.pam
rename to poky/meta/recipes-extended/sudo/files/sudo.pam
diff --git a/import-layers/yocto-poky/meta/recipes-extended/sudo/sudo.inc b/poky/meta/recipes-extended/sudo/sudo.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/sudo/sudo.inc
rename to poky/meta/recipes-extended/sudo/sudo.inc
diff --git a/import-layers/yocto-poky/meta/recipes-extended/sudo/sudo/0001-Include-sys-types.h-for-id_t-definition.patch b/poky/meta/recipes-extended/sudo/sudo/0001-Include-sys-types.h-for-id_t-definition.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/sudo/sudo/0001-Include-sys-types.h-for-id_t-definition.patch
rename to poky/meta/recipes-extended/sudo/sudo/0001-Include-sys-types.h-for-id_t-definition.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/sudo/sudo_1.8.22.bb b/poky/meta/recipes-extended/sudo/sudo_1.8.22.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/sudo/sudo_1.8.22.bb
rename to poky/meta/recipes-extended/sudo/sudo_1.8.22.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/sysklogd/files/0001-Fix-build-with-musl.patch b/poky/meta/recipes-extended/sysklogd/files/0001-Fix-build-with-musl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/sysklogd/files/0001-Fix-build-with-musl.patch
rename to poky/meta/recipes-extended/sysklogd/files/0001-Fix-build-with-musl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/sysklogd/files/0001-fix-problems-that-causes-a-segmentation-fault-under-.patch b/poky/meta/recipes-extended/sysklogd/files/0001-fix-problems-that-causes-a-segmentation-fault-under-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/sysklogd/files/0001-fix-problems-that-causes-a-segmentation-fault-under-.patch
rename to poky/meta/recipes-extended/sysklogd/files/0001-fix-problems-that-causes-a-segmentation-fault-under-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/sysklogd/files/0002-Make-way-for-respecting-flags-from-environment.patch b/poky/meta/recipes-extended/sysklogd/files/0002-Make-way-for-respecting-flags-from-environment.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/sysklogd/files/0002-Make-way-for-respecting-flags-from-environment.patch
rename to poky/meta/recipes-extended/sysklogd/files/0002-Make-way-for-respecting-flags-from-environment.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/sysklogd/files/klogd.service b/poky/meta/recipes-extended/sysklogd/files/klogd.service
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/sysklogd/files/klogd.service
rename to poky/meta/recipes-extended/sysklogd/files/klogd.service
diff --git a/import-layers/yocto-poky/meta/recipes-extended/sysklogd/files/no-strip-install.patch b/poky/meta/recipes-extended/sysklogd/files/no-strip-install.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/sysklogd/files/no-strip-install.patch
rename to poky/meta/recipes-extended/sysklogd/files/no-strip-install.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/sysklogd/files/no-vectorization.patch b/poky/meta/recipes-extended/sysklogd/files/no-vectorization.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/sysklogd/files/no-vectorization.patch
rename to poky/meta/recipes-extended/sysklogd/files/no-vectorization.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/sysklogd/files/sysklogd b/poky/meta/recipes-extended/sysklogd/files/sysklogd
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/sysklogd/files/sysklogd
rename to poky/meta/recipes-extended/sysklogd/files/sysklogd
diff --git a/import-layers/yocto-poky/meta/recipes-extended/sysklogd/files/syslog.conf b/poky/meta/recipes-extended/sysklogd/files/syslog.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/sysklogd/files/syslog.conf
rename to poky/meta/recipes-extended/sysklogd/files/syslog.conf
diff --git a/import-layers/yocto-poky/meta/recipes-extended/sysklogd/files/syslogd.service b/poky/meta/recipes-extended/sysklogd/files/syslogd.service
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/sysklogd/files/syslogd.service
rename to poky/meta/recipes-extended/sysklogd/files/syslogd.service
diff --git a/import-layers/yocto-poky/meta/recipes-extended/sysklogd/files/tmpfiles.sysklogd.conf b/poky/meta/recipes-extended/sysklogd/files/tmpfiles.sysklogd.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/sysklogd/files/tmpfiles.sysklogd.conf
rename to poky/meta/recipes-extended/sysklogd/files/tmpfiles.sysklogd.conf
diff --git a/import-layers/yocto-poky/meta/recipes-extended/sysklogd/sysklogd.inc b/poky/meta/recipes-extended/sysklogd/sysklogd.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/sysklogd/sysklogd.inc
rename to poky/meta/recipes-extended/sysklogd/sysklogd.inc
diff --git a/import-layers/yocto-poky/meta/recipes-extended/sysklogd/sysklogd_1.5.1.bb b/poky/meta/recipes-extended/sysklogd/sysklogd_1.5.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/sysklogd/sysklogd_1.5.1.bb
rename to poky/meta/recipes-extended/sysklogd/sysklogd_1.5.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/sysstat/sysstat.inc b/poky/meta/recipes-extended/sysstat/sysstat.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/sysstat/sysstat.inc
rename to poky/meta/recipes-extended/sysstat/sysstat.inc
diff --git a/import-layers/yocto-poky/meta/recipes-extended/sysstat/sysstat/0001-Include-needed-headers-explicitly.patch b/poky/meta/recipes-extended/sysstat/sysstat/0001-Include-needed-headers-explicitly.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/sysstat/sysstat/0001-Include-needed-headers-explicitly.patch
rename to poky/meta/recipes-extended/sysstat/sysstat/0001-Include-needed-headers-explicitly.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/sysstat/sysstat/99_sysstat b/poky/meta/recipes-extended/sysstat/sysstat/99_sysstat
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/sysstat/sysstat/99_sysstat
rename to poky/meta/recipes-extended/sysstat/sysstat/99_sysstat
diff --git a/import-layers/yocto-poky/meta/recipes-extended/sysstat/sysstat/sysstat.service b/poky/meta/recipes-extended/sysstat/sysstat/sysstat.service
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/sysstat/sysstat/sysstat.service
rename to poky/meta/recipes-extended/sysstat/sysstat/sysstat.service
diff --git a/import-layers/yocto-poky/meta/recipes-extended/sysstat/sysstat_11.7.1.bb b/poky/meta/recipes-extended/sysstat/sysstat_11.7.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/sysstat/sysstat_11.7.1.bb
rename to poky/meta/recipes-extended/sysstat/sysstat_11.7.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/tar/tar.inc b/poky/meta/recipes-extended/tar/tar.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/tar/tar.inc
rename to poky/meta/recipes-extended/tar/tar.inc
diff --git a/import-layers/yocto-poky/meta/recipes-extended/tar/tar/musl_dirent.patch b/poky/meta/recipes-extended/tar/tar/musl_dirent.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/tar/tar/musl_dirent.patch
rename to poky/meta/recipes-extended/tar/tar/musl_dirent.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/tar/tar/remove-gets.patch b/poky/meta/recipes-extended/tar/tar/remove-gets.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/tar/tar/remove-gets.patch
rename to poky/meta/recipes-extended/tar/tar/remove-gets.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/tar/tar_1.30.bb b/poky/meta/recipes-extended/tar/tar_1.30.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/tar/tar_1.30.bb
rename to poky/meta/recipes-extended/tar/tar_1.30.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Fix-build-with-clang.patch b/poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Fix-build-with-clang.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Fix-build-with-clang.patch
rename to poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/0001-Fix-build-with-clang.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/00_man_quoting.diff b/poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/00_man_quoting.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/00_man_quoting.diff
rename to poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/00_man_quoting.diff
diff --git a/import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/01_man_portability.patch b/poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/01_man_portability.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/01_man_portability.patch
rename to poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/01_man_portability.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/05_wildcard_matching.patch b/poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/05_wildcard_matching.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/05_wildcard_matching.patch
rename to poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/05_wildcard_matching.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/06_fix_gethostbyname.patch b/poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/06_fix_gethostbyname.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/06_fix_gethostbyname.patch
rename to poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/06_fix_gethostbyname.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/10_usagi-ipv6.patch b/poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/10_usagi-ipv6.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/10_usagi-ipv6.patch
rename to poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/10_usagi-ipv6.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_tcpd_blacklist.patch b/poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_tcpd_blacklist.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_tcpd_blacklist.patch
rename to poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_tcpd_blacklist.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch b/poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch
rename to poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch b/poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch
rename to poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/12_makefile_config.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/13_shlib_weaksym.patch b/poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/13_shlib_weaksym.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/13_shlib_weaksym.patch
rename to poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/13_shlib_weaksym.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/14_cidr_support.patch b/poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/14_cidr_support.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/14_cidr_support.patch
rename to poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/14_cidr_support.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/15_match_clarify.patch b/poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/15_match_clarify.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/15_match_clarify.patch
rename to poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/15_match_clarify.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/expand_remote_port.patch b/poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/expand_remote_port.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/expand_remote_port.patch
rename to poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/expand_remote_port.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/have_strerror.patch b/poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/have_strerror.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/have_strerror.patch
rename to poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/have_strerror.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/ldflags.patch b/poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/ldflags.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/ldflags.patch
rename to poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/ldflags.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/makefile-fix-parallel.patch b/poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/makefile-fix-parallel.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/makefile-fix-parallel.patch
rename to poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/makefile-fix-parallel.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/man_fromhost.patch b/poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/man_fromhost.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/man_fromhost.patch
rename to poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/man_fromhost.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/musl-decls.patch b/poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/musl-decls.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/musl-decls.patch
rename to poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/musl-decls.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rename_strings_variable.patch b/poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rename_strings_variable.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rename_strings_variable.patch
rename to poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rename_strings_variable.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/restore_sigalarm.patch b/poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/restore_sigalarm.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/restore_sigalarm.patch
rename to poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/restore_sigalarm.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rfc931.diff b/poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rfc931.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rfc931.diff
rename to poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rfc931.diff
diff --git a/import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/safe_finger.8 b/poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/safe_finger.8
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/safe_finger.8
rename to poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/safe_finger.8
diff --git a/import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/safe_finger.patch b/poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/safe_finger.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/safe_finger.patch
rename to poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/safe_finger.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/sig_fix.patch b/poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/sig_fix.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/sig_fix.patch
rename to poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/sig_fix.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/siglongjmp.patch b/poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/siglongjmp.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/siglongjmp.patch
rename to poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/siglongjmp.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/socklen_t.patch b/poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/socklen_t.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/socklen_t.patch
rename to poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/socklen_t.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/tcpdchk_libwrapped.patch b/poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/tcpdchk_libwrapped.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/tcpdchk_libwrapped.patch
rename to poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/tcpdchk_libwrapped.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/try-from.8 b/poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/try-from.8
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/try-from.8
rename to poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/try-from.8
diff --git a/import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb b/poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
rename to poky/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/texi2html/files/0001-Allow-compiling-out-of-source.patch b/poky/meta/recipes-extended/texi2html/files/0001-Allow-compiling-out-of-source.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/texi2html/files/0001-Allow-compiling-out-of-source.patch
rename to poky/meta/recipes-extended/texi2html/files/0001-Allow-compiling-out-of-source.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/texi2html/texi2html_5.0.bb b/poky/meta/recipes-extended/texi2html/texi2html_5.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/texi2html/texi2html_5.0.bb
rename to poky/meta/recipes-extended/texi2html/texi2html_5.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb b/poky/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb
rename to poky/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy/COPYING b/poky/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy/COPYING
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy/COPYING
rename to poky/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy/COPYING
diff --git a/import-layers/yocto-poky/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy/template.py b/poky/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy/template.py
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy/template.py
rename to poky/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy/template.py
diff --git a/import-layers/yocto-poky/meta/recipes-extended/texinfo/texinfo/0001-Unset-need_charset_alias-when-building-for-musl.patch b/poky/meta/recipes-extended/texinfo/texinfo/0001-Unset-need_charset_alias-when-building-for-musl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/texinfo/texinfo/0001-Unset-need_charset_alias-when-building-for-musl.patch
rename to poky/meta/recipes-extended/texinfo/texinfo/0001-Unset-need_charset_alias-when-building-for-musl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/texinfo/texinfo/disable-native-tools.patch b/poky/meta/recipes-extended/texinfo/texinfo/disable-native-tools.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/texinfo/texinfo/disable-native-tools.patch
rename to poky/meta/recipes-extended/texinfo/texinfo/disable-native-tools.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch b/poky/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch
rename to poky/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/texinfo/texinfo/link-zip.patch b/poky/meta/recipes-extended/texinfo/texinfo/link-zip.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/texinfo/texinfo/link-zip.patch
rename to poky/meta/recipes-extended/texinfo/texinfo/link-zip.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch b/poky/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch
rename to poky/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/texinfo/texinfo/use_host_makedoc.patch b/poky/meta/recipes-extended/texinfo/texinfo/use_host_makedoc.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/texinfo/texinfo/use_host_makedoc.patch
rename to poky/meta/recipes-extended/texinfo/texinfo/use_host_makedoc.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/texinfo/texinfo_6.5.bb b/poky/meta/recipes-extended/texinfo/texinfo_6.5.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/texinfo/texinfo_6.5.bb
rename to poky/meta/recipes-extended/texinfo/texinfo_6.5.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/time/time_1.8.bb b/poky/meta/recipes-extended/time/time_1.8.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/time/time_1.8.bb
rename to poky/meta/recipes-extended/time/time_1.8.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/tzcode/tzcode-native_2018d.bb b/poky/meta/recipes-extended/tzcode/tzcode-native_2018d.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/tzcode/tzcode-native_2018d.bb
rename to poky/meta/recipes-extended/tzcode/tzcode-native_2018d.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/tzdata/tzdata_2018d.bb b/poky/meta/recipes-extended/tzdata/tzdata_2018d.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/tzdata/tzdata_2018d.bb
rename to poky/meta/recipes-extended/tzdata/tzdata_2018d.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/unzip/unzip/06-unzip60-alt-iconv-utf8_CVE-2015-1315.patch b/poky/meta/recipes-extended/unzip/unzip/06-unzip60-alt-iconv-utf8_CVE-2015-1315.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/unzip/unzip/06-unzip60-alt-iconv-utf8_CVE-2015-1315.patch
rename to poky/meta/recipes-extended/unzip/unzip/06-unzip60-alt-iconv-utf8_CVE-2015-1315.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/unzip/unzip/09-cve-2014-8139-crc-overflow.patch b/poky/meta/recipes-extended/unzip/unzip/09-cve-2014-8139-crc-overflow.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/unzip/unzip/09-cve-2014-8139-crc-overflow.patch
rename to poky/meta/recipes-extended/unzip/unzip/09-cve-2014-8139-crc-overflow.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/unzip/unzip/10-cve-2014-8140-test-compr-eb.patch b/poky/meta/recipes-extended/unzip/unzip/10-cve-2014-8140-test-compr-eb.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/unzip/unzip/10-cve-2014-8140-test-compr-eb.patch
rename to poky/meta/recipes-extended/unzip/unzip/10-cve-2014-8140-test-compr-eb.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/unzip/unzip/11-cve-2014-8141-getzip64data.patch b/poky/meta/recipes-extended/unzip/unzip/11-cve-2014-8141-getzip64data.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/unzip/unzip/11-cve-2014-8141-getzip64data.patch
rename to poky/meta/recipes-extended/unzip/unzip/11-cve-2014-8141-getzip64data.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/unzip/unzip/18-cve-2014-9913-unzip-buffer-overflow.patch b/poky/meta/recipes-extended/unzip/unzip/18-cve-2014-9913-unzip-buffer-overflow.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/unzip/unzip/18-cve-2014-9913-unzip-buffer-overflow.patch
rename to poky/meta/recipes-extended/unzip/unzip/18-cve-2014-9913-unzip-buffer-overflow.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/unzip/unzip/19-cve-2016-9844-zipinfo-buffer-overflow.patch b/poky/meta/recipes-extended/unzip/unzip/19-cve-2016-9844-zipinfo-buffer-overflow.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/unzip/unzip/19-cve-2016-9844-zipinfo-buffer-overflow.patch
rename to poky/meta/recipes-extended/unzip/unzip/19-cve-2016-9844-zipinfo-buffer-overflow.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/unzip/unzip/CVE-2015-7696.patch b/poky/meta/recipes-extended/unzip/unzip/CVE-2015-7696.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/unzip/unzip/CVE-2015-7696.patch
rename to poky/meta/recipes-extended/unzip/unzip/CVE-2015-7696.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/unzip/unzip/CVE-2015-7697.patch b/poky/meta/recipes-extended/unzip/unzip/CVE-2015-7697.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/unzip/unzip/CVE-2015-7697.patch
rename to poky/meta/recipes-extended/unzip/unzip/CVE-2015-7697.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/unzip/unzip/avoid-strip.patch b/poky/meta/recipes-extended/unzip/unzip/avoid-strip.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/unzip/unzip/avoid-strip.patch
rename to poky/meta/recipes-extended/unzip/unzip/avoid-strip.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/unzip/unzip/cve-2014-9636.patch b/poky/meta/recipes-extended/unzip/unzip/cve-2014-9636.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/unzip/unzip/cve-2014-9636.patch
rename to poky/meta/recipes-extended/unzip/unzip/cve-2014-9636.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/unzip/unzip/define-ldflags.patch b/poky/meta/recipes-extended/unzip/unzip/define-ldflags.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/unzip/unzip/define-ldflags.patch
rename to poky/meta/recipes-extended/unzip/unzip/define-ldflags.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/unzip/unzip/fix-security-format.patch b/poky/meta/recipes-extended/unzip/unzip/fix-security-format.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/unzip/unzip/fix-security-format.patch
rename to poky/meta/recipes-extended/unzip/unzip/fix-security-format.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/unzip/unzip_6.0.bb b/poky/meta/recipes-extended/unzip/unzip_6.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/unzip/unzip_6.0.bb
rename to poky/meta/recipes-extended/unzip/unzip_6.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog-config.bb b/poky/meta/recipes-extended/watchdog/watchdog-config.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog-config.bb
rename to poky/meta/recipes-extended/watchdog/watchdog-config.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog-config/watchdog.conf b/poky/meta/recipes-extended/watchdog/watchdog-config/watchdog.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog-config/watchdog.conf
rename to poky/meta/recipes-extended/watchdog/watchdog-config/watchdog.conf
diff --git a/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog-config/watchdog.default b/poky/meta/recipes-extended/watchdog/watchdog-config/watchdog.default
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog-config/watchdog.default
rename to poky/meta/recipes-extended/watchdog/watchdog-config/watchdog.default
diff --git a/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog/0001-Include-linux-param.h-for-EXEC_PAGESIZE-definition.patch b/poky/meta/recipes-extended/watchdog/watchdog/0001-Include-linux-param.h-for-EXEC_PAGESIZE-definition.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog/0001-Include-linux-param.h-for-EXEC_PAGESIZE-definition.patch
rename to poky/meta/recipes-extended/watchdog/watchdog/0001-Include-linux-param.h-for-EXEC_PAGESIZE-definition.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog/0001-watchdog-remove-interdependencies-of-watchdog-and-wd.patch b/poky/meta/recipes-extended/watchdog/watchdog/0001-watchdog-remove-interdependencies-of-watchdog-and-wd.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog/0001-watchdog-remove-interdependencies-of-watchdog-and-wd.patch
rename to poky/meta/recipes-extended/watchdog/watchdog/0001-watchdog-remove-interdependencies-of-watchdog-and-wd.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog/watchdog-conf.patch b/poky/meta/recipes-extended/watchdog/watchdog/watchdog-conf.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog/watchdog-conf.patch
rename to poky/meta/recipes-extended/watchdog/watchdog/watchdog-conf.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog/watchdog-init.patch b/poky/meta/recipes-extended/watchdog/watchdog/watchdog-init.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog/watchdog-init.patch
rename to poky/meta/recipes-extended/watchdog/watchdog/watchdog-init.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog/wd_keepalive.init b/poky/meta/recipes-extended/watchdog/watchdog/wd_keepalive.init
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog/wd_keepalive.init
rename to poky/meta/recipes-extended/watchdog/watchdog/wd_keepalive.init
diff --git a/import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog_5.15.bb b/poky/meta/recipes-extended/watchdog/watchdog_5.15.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/watchdog/watchdog_5.15.bb
rename to poky/meta/recipes-extended/watchdog/watchdog_5.15.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/wget/wget.inc b/poky/meta/recipes-extended/wget/wget.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/wget/wget.inc
rename to poky/meta/recipes-extended/wget/wget.inc
diff --git a/import-layers/yocto-poky/meta/recipes-extended/wget/wget/0001-Unset-need_charset_alias-when-building-for-musl.patch b/poky/meta/recipes-extended/wget/wget/0001-Unset-need_charset_alias-when-building-for-musl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/wget/wget/0001-Unset-need_charset_alias-when-building-for-musl.patch
rename to poky/meta/recipes-extended/wget/wget/0001-Unset-need_charset_alias-when-building-for-musl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/wget/wget/0002-improve-reproducibility.patch b/poky/meta/recipes-extended/wget/wget/0002-improve-reproducibility.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/wget/wget/0002-improve-reproducibility.patch
rename to poky/meta/recipes-extended/wget/wget/0002-improve-reproducibility.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/wget/wget_1.19.5.bb b/poky/meta/recipes-extended/wget/wget_1.19.5.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/wget/wget_1.19.5.bb
rename to poky/meta/recipes-extended/wget/wget_1.19.5.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/which/which-2.21/automake.patch b/poky/meta/recipes-extended/which/which-2.21/automake.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/which/which-2.21/automake.patch
rename to poky/meta/recipes-extended/which/which-2.21/automake.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/which/which_2.21.bb b/poky/meta/recipes-extended/which/which_2.21.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/which/which_2.21.bb
rename to poky/meta/recipes-extended/which/which_2.21.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/xdg-utils/xdg-utils/0001-Don-t-build-the-in-script-manual.patch b/poky/meta/recipes-extended/xdg-utils/xdg-utils/0001-Don-t-build-the-in-script-manual.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/xdg-utils/xdg-utils/0001-Don-t-build-the-in-script-manual.patch
rename to poky/meta/recipes-extended/xdg-utils/xdg-utils/0001-Don-t-build-the-in-script-manual.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/xdg-utils/xdg-utils/0001-Reinstate-xdg-terminal.patch b/poky/meta/recipes-extended/xdg-utils/xdg-utils/0001-Reinstate-xdg-terminal.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/xdg-utils/xdg-utils/0001-Reinstate-xdg-terminal.patch
rename to poky/meta/recipes-extended/xdg-utils/xdg-utils/0001-Reinstate-xdg-terminal.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/xdg-utils/xdg-utils_1.1.2.bb b/poky/meta/recipes-extended/xdg-utils/xdg-utils_1.1.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/xdg-utils/xdg-utils_1.1.2.bb
rename to poky/meta/recipes-extended/xdg-utils/xdg-utils_1.1.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/xinetd/xinetd/0001-configure-Use-HAVE_SYS_RESOURCE_H-to-guard-sys-resou.patch b/poky/meta/recipes-extended/xinetd/xinetd/0001-configure-Use-HAVE_SYS_RESOURCE_H-to-guard-sys-resou.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/xinetd/xinetd/0001-configure-Use-HAVE_SYS_RESOURCE_H-to-guard-sys-resou.patch
rename to poky/meta/recipes-extended/xinetd/xinetd/0001-configure-Use-HAVE_SYS_RESOURCE_H-to-guard-sys-resou.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/xinetd/xinetd/Disable-services-from-inetd.conf-if-a-service-with-t.patch b/poky/meta/recipes-extended/xinetd/xinetd/Disable-services-from-inetd.conf-if-a-service-with-t.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/xinetd/xinetd/Disable-services-from-inetd.conf-if-a-service-with-t.patch
rename to poky/meta/recipes-extended/xinetd/xinetd/Disable-services-from-inetd.conf-if-a-service-with-t.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/xinetd/xinetd/Various-fixes-from-the-previous-maintainer.patch b/poky/meta/recipes-extended/xinetd/xinetd/Various-fixes-from-the-previous-maintainer.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/xinetd/xinetd/Various-fixes-from-the-previous-maintainer.patch
rename to poky/meta/recipes-extended/xinetd/xinetd/Various-fixes-from-the-previous-maintainer.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/xinetd/xinetd/xinetd-CVE-2013-4342.patch b/poky/meta/recipes-extended/xinetd/xinetd/xinetd-CVE-2013-4342.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/xinetd/xinetd/xinetd-CVE-2013-4342.patch
rename to poky/meta/recipes-extended/xinetd/xinetd/xinetd-CVE-2013-4342.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/xinetd/xinetd/xinetd-should-be-able-to-listen-on-IPv6-even-in-ine.patch b/poky/meta/recipes-extended/xinetd/xinetd/xinetd-should-be-able-to-listen-on-IPv6-even-in-ine.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/xinetd/xinetd/xinetd-should-be-able-to-listen-on-IPv6-even-in-ine.patch
rename to poky/meta/recipes-extended/xinetd/xinetd/xinetd-should-be-able-to-listen-on-IPv6-even-in-ine.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/xinetd/xinetd/xinetd.conf b/poky/meta/recipes-extended/xinetd/xinetd/xinetd.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/xinetd/xinetd/xinetd.conf
rename to poky/meta/recipes-extended/xinetd/xinetd/xinetd.conf
diff --git a/import-layers/yocto-poky/meta/recipes-extended/xinetd/xinetd/xinetd.default b/poky/meta/recipes-extended/xinetd/xinetd/xinetd.default
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/xinetd/xinetd/xinetd.default
rename to poky/meta/recipes-extended/xinetd/xinetd/xinetd.default
diff --git a/import-layers/yocto-poky/meta/recipes-extended/xinetd/xinetd/xinetd.init b/poky/meta/recipes-extended/xinetd/xinetd/xinetd.init
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/xinetd/xinetd/xinetd.init
rename to poky/meta/recipes-extended/xinetd/xinetd/xinetd.init
diff --git a/import-layers/yocto-poky/meta/recipes-extended/xinetd/xinetd/xinetd.service b/poky/meta/recipes-extended/xinetd/xinetd/xinetd.service
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/xinetd/xinetd/xinetd.service
rename to poky/meta/recipes-extended/xinetd/xinetd/xinetd.service
diff --git a/import-layers/yocto-poky/meta/recipes-extended/xinetd/xinetd_2.3.15.bb b/poky/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
rename to poky/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/xz/xz_5.2.3.bb b/poky/meta/recipes-extended/xz/xz_5.2.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/xz/xz_5.2.3.bb
rename to poky/meta/recipes-extended/xz/xz_5.2.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-extended/zip/zip-3.0/fix-security-format.patch b/poky/meta/recipes-extended/zip/zip-3.0/fix-security-format.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/zip/zip-3.0/fix-security-format.patch
rename to poky/meta/recipes-extended/zip/zip-3.0/fix-security-format.patch
diff --git a/import-layers/yocto-poky/meta/recipes-extended/zip/zip_3.0.bb b/poky/meta/recipes-extended/zip/zip_3.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-extended/zip/zip_3.0.bb
rename to poky/meta/recipes-extended/zip/zip_3.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/epiphany/epiphany_3.26.6.bb b/poky/meta/recipes-gnome/epiphany/epiphany_3.26.6.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/epiphany/epiphany_3.26.6.bb
rename to poky/meta/recipes-gnome/epiphany/epiphany_3.26.6.bb
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch b/poky/meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch
rename to poky/meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch b/poky/meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch
rename to poky/meta/recipes-gnome/gcr/files/gcr-add-missing-dependencies-for-vapi.patch
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gcr/gcr_3.20.0.bb b/poky/meta/recipes-gnome/gcr/gcr_3.20.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gcr/gcr_3.20.0.bb
rename to poky/meta/recipes-gnome/gcr/gcr_3.20.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-without-libtiff-not-having-an-effect.patch b/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-without-libtiff-not-having-an-effect.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-without-libtiff-not-having-an-effect.patch
rename to poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-without-libtiff-not-having-an-effect.patch
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-cross-compile-failure.patch b/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-cross-compile-failure.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-cross-compile-failure.patch
rename to poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Work-around-thumbnailer-cross-compile-failure.patch
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/extending-libinstall-dependencies.patch b/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/extending-libinstall-dependencies.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/extending-libinstall-dependencies.patch
rename to poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/extending-libinstall-dependencies.patch
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch b/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch
rename to poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/hardcoded_libtool.patch b/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/hardcoded_libtool.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/hardcoded_libtool.patch
rename to poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/hardcoded_libtool.patch
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/run-ptest b/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/run-ptest
rename to poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.11.bb b/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.11.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.11.bb
rename to poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.11.bb
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch b/poky/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch
rename to poky/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch b/poky/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch
rename to poky/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch b/poky/meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch
rename to poky/meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.26.2.bb b/poky/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.26.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.26.2.bb
rename to poky/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.26.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch b/poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch
rename to poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch b/poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch
rename to poky/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gnome/adwaita-icon-theme_3.26.1.bb b/poky/meta/recipes-gnome/gnome/adwaita-icon-theme_3.26.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gnome/adwaita-icon-theme_3.26.1.bb
rename to poky/meta/recipes-gnome/gnome/adwaita-icon-theme_3.26.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gnome/gconf/create_config_directory.patch b/poky/meta/recipes-gnome/gnome/gconf/create_config_directory.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gnome/gconf/create_config_directory.patch
rename to poky/meta/recipes-gnome/gnome/gconf/create_config_directory.patch
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gnome/gconf/remove_plus_from_invalid_characters_list.patch b/poky/meta/recipes-gnome/gnome/gconf/remove_plus_from_invalid_characters_list.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gnome/gconf/remove_plus_from_invalid_characters_list.patch
rename to poky/meta/recipes-gnome/gnome/gconf/remove_plus_from_invalid_characters_list.patch
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gnome/gconf/unable-connect-dbus.patch b/poky/meta/recipes-gnome/gnome/gconf/unable-connect-dbus.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gnome/gconf/unable-connect-dbus.patch
rename to poky/meta/recipes-gnome/gnome/gconf/unable-connect-dbus.patch
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gnome/gconf_3.2.6.bb b/poky/meta/recipes-gnome/gnome/gconf_3.2.6.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gnome/gconf_3.2.6.bb
rename to poky/meta/recipes-gnome/gnome/gconf_3.2.6.bb
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gnome/gnome-doc-utils/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch b/poky/meta/recipes-gnome/gnome/gnome-doc-utils/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gnome/gnome-doc-utils/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch
rename to poky/meta/recipes-gnome/gnome/gnome-doc-utils/0001-glib-gettext.m4-Update-AM_GLIB_GNU_GETTEXT-to-match-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gnome/gnome-themes-standard_3.22.3.bb b/poky/meta/recipes-gnome/gnome/gnome-themes-standard_3.22.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gnome/gnome-themes-standard_3.22.3.bb
rename to poky/meta/recipes-gnome/gnome/gnome-themes-standard_3.22.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gnome/libart-lgpl/libart_lgpl-2.3.21-crosscompile.patch b/poky/meta/recipes-gnome/gnome/libart-lgpl/libart_lgpl-2.3.21-crosscompile.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gnome/libart-lgpl/libart_lgpl-2.3.21-crosscompile.patch
rename to poky/meta/recipes-gnome/gnome/libart-lgpl/libart_lgpl-2.3.21-crosscompile.patch
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb b/poky/meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb
rename to poky/meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch
rename to poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch
rename to poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-add-a-lib-dirs-envvar-option.patch
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch
rename to poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0002-configure.ac-add-host-gi-gi-cross-wrapper-gi-ldd-wra.patch
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch
rename to poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0003-giscanner-add-use-binary-wrapper-option.patch
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch
rename to poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0004-giscanner-add-a-use-ldd-wrapper-option.patch
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch
rename to poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.54.1.bb b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.54.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.54.1.bb
rename to poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.54.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.24.1.bb b/poky/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.24.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.24.1.bb
rename to poky/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.24.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gtk+/gtk+.inc b/poky/meta/recipes-gnome/gtk+/gtk+.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gtk+/gtk+.inc
rename to poky/meta/recipes-gnome/gtk+/gtk+.inc
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gtk+/gtk+/doc-fixes.patch b/poky/meta/recipes-gnome/gtk+/gtk+/doc-fixes.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gtk+/gtk+/doc-fixes.patch
rename to poky/meta/recipes-gnome/gtk+/gtk+/doc-fixes.patch
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch b/poky/meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch
rename to poky/meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gtk+/gtk+/strict-prototypes.patch b/poky/meta/recipes-gnome/gtk+/gtk+/strict-prototypes.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gtk+/gtk+/strict-prototypes.patch
rename to poky/meta/recipes-gnome/gtk+/gtk+/strict-prototypes.patch
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gtk+/gtk+/toggle-font.diff b/poky/meta/recipes-gnome/gtk+/gtk+/toggle-font.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gtk+/gtk+/toggle-font.diff
rename to poky/meta/recipes-gnome/gtk+/gtk+/toggle-font.diff
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gtk+/gtk+/xsettings.patch b/poky/meta/recipes-gnome/gtk+/gtk+/xsettings.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gtk+/gtk+/xsettings.patch
rename to poky/meta/recipes-gnome/gtk+/gtk+/xsettings.patch
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gtk+/gtk+3.inc b/poky/meta/recipes-gnome/gtk+/gtk+3.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gtk+/gtk+3.inc
rename to poky/meta/recipes-gnome/gtk+/gtk+3.inc
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gtk+/gtk+3/0001-Hardcoded-libtool.patch b/poky/meta/recipes-gnome/gtk+/gtk+3/0001-Hardcoded-libtool.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gtk+/gtk+3/0001-Hardcoded-libtool.patch
rename to poky/meta/recipes-gnome/gtk+/gtk+3/0001-Hardcoded-libtool.patch
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gtk+/gtk+3/0002-Do-not-try-to-initialize-GL-without-libGL.patch b/poky/meta/recipes-gnome/gtk+/gtk+3/0002-Do-not-try-to-initialize-GL-without-libGL.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gtk+/gtk+3/0002-Do-not-try-to-initialize-GL-without-libGL.patch
rename to poky/meta/recipes-gnome/gtk+/gtk+3/0002-Do-not-try-to-initialize-GL-without-libGL.patch
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch b/poky/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch
rename to poky/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gtk+/gtk+3_3.22.28.bb b/poky/meta/recipes-gnome/gtk+/gtk+3_3.22.28.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gtk+/gtk+3_3.22.28.bb
rename to poky/meta/recipes-gnome/gtk+/gtk+3_3.22.28.bb
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gtk+/gtk+_2.24.32.bb b/poky/meta/recipes-gnome/gtk+/gtk+_2.24.32.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gtk+/gtk+_2.24.32.bb
rename to poky/meta/recipes-gnome/gtk+/gtk+_2.24.32.bb
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.28.bb b/poky/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.28.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.28.bb
rename to poky/meta/recipes-gnome/gtk+/gtk-icon-utils-native_3.22.28.bb
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gtk+/gtk-icon-utils/Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch b/poky/meta/recipes-gnome/gtk+/gtk-icon-utils/Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gtk+/gtk-icon-utils/Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch
rename to poky/meta/recipes-gnome/gtk+/gtk-icon-utils/Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gtk-doc/files/0001-Do-not-error-out-if-xsltproc-is-not-found.patch b/poky/meta/recipes-gnome/gtk-doc/files/0001-Do-not-error-out-if-xsltproc-is-not-found.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gtk-doc/files/0001-Do-not-error-out-if-xsltproc-is-not-found.patch
rename to poky/meta/recipes-gnome/gtk-doc/files/0001-Do-not-error-out-if-xsltproc-is-not-found.patch
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gtk-doc/files/0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch b/poky/meta/recipes-gnome/gtk-doc/files/0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gtk-doc/files/0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch
rename to poky/meta/recipes-gnome/gtk-doc/files/0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gtk-doc/files/conditionaltests.patch b/poky/meta/recipes-gnome/gtk-doc/files/conditionaltests.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gtk-doc/files/conditionaltests.patch
rename to poky/meta/recipes-gnome/gtk-doc/files/conditionaltests.patch
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gtk-doc/files/no-clobber.patch b/poky/meta/recipes-gnome/gtk-doc/files/no-clobber.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gtk-doc/files/no-clobber.patch
rename to poky/meta/recipes-gnome/gtk-doc/files/no-clobber.patch
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch b/poky/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch
rename to poky/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.27.bb b/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.27.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.27.bb
rename to poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.27.bb
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.17.bb b/poky/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.17.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.17.bb
rename to poky/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.17.bb
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/json-glib/json-glib_1.4.2.bb b/poky/meta/recipes-gnome/json-glib/json-glib_1.4.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/json-glib/json-glib_1.4.2.bb
rename to poky/meta/recipes-gnome/json-glib/json-glib_1.4.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/libgudev/libgudev_232.bb b/poky/meta/recipes-gnome/libgudev/libgudev_232.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/libgudev/libgudev_232.bb
rename to poky/meta/recipes-gnome/libgudev/libgudev_232.bb
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/libnotify/libnotify_0.7.7.bb b/poky/meta/recipes-gnome/libnotify/libnotify_0.7.7.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/libnotify/libnotify_0.7.7.bb
rename to poky/meta/recipes-gnome/libnotify/libnotify_0.7.7.bb
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch b/poky/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch
rename to poky/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/librsvg/librsvg_2.40.20.bb b/poky/meta/recipes-gnome/librsvg/librsvg_2.40.20.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/librsvg/librsvg_2.40.20.bb
rename to poky/meta/recipes-gnome/librsvg/librsvg_2.40.20.bb
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/libsecret/libsecret_0.18.5.bb b/poky/meta/recipes-gnome/libsecret/libsecret_0.18.5.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-gnome/libsecret/libsecret_0.18.5.bb
rename to poky/meta/recipes-gnome/libsecret/libsecret_0.18.5.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/builder/builder_0.1.bb b/poky/meta/recipes-graphics/builder/builder_0.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/builder/builder_0.1.bb
rename to poky/meta/recipes-graphics/builder/builder_0.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/builder/files/builder_session.sh b/poky/meta/recipes-graphics/builder/files/builder_session.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/builder/files/builder_session.sh
rename to poky/meta/recipes-graphics/builder/files/builder_session.sh
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/cairo/cairo-fpu.inc b/poky/meta/recipes-graphics/cairo/cairo-fpu.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/cairo/cairo-fpu.inc
rename to poky/meta/recipes-graphics/cairo/cairo-fpu.inc
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/cairo/cairo.inc b/poky/meta/recipes-graphics/cairo/cairo.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/cairo/cairo.inc
rename to poky/meta/recipes-graphics/cairo/cairo.inc
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/cairo/cairo/0001-cairo-Fix-CVE-2017-9814.patch b/poky/meta/recipes-graphics/cairo/cairo/0001-cairo-Fix-CVE-2017-9814.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/cairo/cairo/0001-cairo-Fix-CVE-2017-9814.patch
rename to poky/meta/recipes-graphics/cairo/cairo/0001-cairo-Fix-CVE-2017-9814.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/cairo/cairo/cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff b/poky/meta/recipes-graphics/cairo/cairo/cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/cairo/cairo/cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff
rename to poky/meta/recipes-graphics/cairo/cairo/cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/cairo/cairo_1.14.12.bb b/poky/meta/recipes-graphics/cairo/cairo_1.14.12.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/cairo/cairo_1.14.12.bb
rename to poky/meta/recipes-graphics/cairo/cairo_1.14.12.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_git.bb b/poky/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_git.bb
rename to poky/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0.inc b/poky/meta/recipes-graphics/clutter/clutter-1.0.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0.inc
rename to poky/meta/recipes-graphics/clutter/clutter-1.0.inc
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/0001-Remove-clutter.types-as-it-is-build-configuration-sp.patch b/poky/meta/recipes-graphics/clutter/clutter-1.0/0001-Remove-clutter.types-as-it-is-build-configuration-sp.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/0001-Remove-clutter.types-as-it-is-build-configuration-sp.patch
rename to poky/meta/recipes-graphics/clutter/clutter-1.0/0001-Remove-clutter.types-as-it-is-build-configuration-sp.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch b/poky/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch
rename to poky/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch b/poky/meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch
rename to poky/meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/run-ptest b/poky/meta/recipes-graphics/clutter/clutter-1.0/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/run-ptest
rename to poky/meta/recipes-graphics/clutter/clutter-1.0/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0_1.26.2.bb b/poky/meta/recipes-graphics/clutter/clutter-1.0_1.26.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0_1.26.2.bb
rename to poky/meta/recipes-graphics/clutter/clutter-1.0_1.26.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0.inc b/poky/meta/recipes-graphics/clutter/clutter-gst-3.0.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0.inc
rename to poky/meta/recipes-graphics/clutter/clutter-gst-3.0.inc
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0/0001-Install-example-binary-needed-for-core-image-clutter.patch b/poky/meta/recipes-graphics/clutter/clutter-gst-3.0/0001-Install-example-binary-needed-for-core-image-clutter.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0/0001-Install-example-binary-needed-for-core-image-clutter.patch
rename to poky/meta/recipes-graphics/clutter/clutter-gst-3.0/0001-Install-example-binary-needed-for-core-image-clutter.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.24.bb b/poky/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.24.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.24.bb
rename to poky/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.24.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc b/poky/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc
rename to poky/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb b/poky/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb
rename to poky/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0.inc b/poky/meta/recipes-graphics/cogl/cogl-1.0.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0.inc
rename to poky/meta/recipes-graphics/cogl/cogl-1.0.inc
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0/0001-Fix-an-incorrect-preprocessor-conditional.patch b/poky/meta/recipes-graphics/cogl/cogl-1.0/0001-Fix-an-incorrect-preprocessor-conditional.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0/0001-Fix-an-incorrect-preprocessor-conditional.patch
rename to poky/meta/recipes-graphics/cogl/cogl-1.0/0001-Fix-an-incorrect-preprocessor-conditional.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0/test-backface-culling.c-fix-may-be-used-uninitialize.patch b/poky/meta/recipes-graphics/cogl/cogl-1.0/test-backface-culling.c-fix-may-be-used-uninitialize.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0/test-backface-culling.c-fix-may-be-used-uninitialize.patch
rename to poky/meta/recipes-graphics/cogl/cogl-1.0/test-backface-culling.c-fix-may-be-used-uninitialize.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0_1.22.2.bb b/poky/meta/recipes-graphics/cogl/cogl-1.0_1.22.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0_1.22.2.bb
rename to poky/meta/recipes-graphics/cogl/cogl-1.0_1.22.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/drm/libdrm/0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch b/poky/meta/recipes-graphics/drm/libdrm/0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/drm/libdrm/0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch
rename to poky/meta/recipes-graphics/drm/libdrm/0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/drm/libdrm/fix_O_CLOEXEC_undeclared.patch b/poky/meta/recipes-graphics/drm/libdrm/fix_O_CLOEXEC_undeclared.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/drm/libdrm/fix_O_CLOEXEC_undeclared.patch
rename to poky/meta/recipes-graphics/drm/libdrm/fix_O_CLOEXEC_undeclared.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/drm/libdrm/installtests.patch b/poky/meta/recipes-graphics/drm/libdrm/installtests.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/drm/libdrm/installtests.patch
rename to poky/meta/recipes-graphics/drm/libdrm/installtests.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/drm/libdrm_2.4.91.bb b/poky/meta/recipes-graphics/drm/libdrm_2.4.91.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/drm/libdrm_2.4.91.bb
rename to poky/meta/recipes-graphics/drm/libdrm_2.4.91.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.0.bb b/poky/meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.0.bb
rename to poky/meta/recipes-graphics/eglinfo/eglinfo-fb_1.0.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.0.bb b/poky/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.0.bb
rename to poky/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/eglinfo/eglinfo.inc b/poky/meta/recipes-graphics/eglinfo/eglinfo.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/eglinfo/eglinfo.inc
rename to poky/meta/recipes-graphics/eglinfo/eglinfo.inc
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/eglinfo/files/0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch b/poky/meta/recipes-graphics/eglinfo/files/0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/eglinfo/files/0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch
rename to poky/meta/recipes-graphics/eglinfo/files/0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fcxml.c-avoid-double-free-of-filename.patch b/poky/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fcxml.c-avoid-double-free-of-filename.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fcxml.c-avoid-double-free-of-filename.patch
rename to poky/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fcxml.c-avoid-double-free-of-filename.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/fontconfig/fontconfig/revert-static-pkgconfig.patch b/poky/meta/recipes-graphics/fontconfig/fontconfig/revert-static-pkgconfig.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/fontconfig/fontconfig/revert-static-pkgconfig.patch
rename to poky/meta/recipes-graphics/fontconfig/fontconfig/revert-static-pkgconfig.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb b/poky/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb
rename to poky/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/freetype/freetype/use-right-libtool.patch b/poky/meta/recipes-graphics/freetype/freetype/use-right-libtool.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/freetype/freetype/use-right-libtool.patch
rename to poky/meta/recipes-graphics/freetype/freetype/use-right-libtool.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/freetype/freetype_2.9.bb b/poky/meta/recipes-graphics/freetype/freetype_2.9.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/freetype/freetype_2.9.bb
rename to poky/meta/recipes-graphics/freetype/freetype_2.9.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/fstests/fstests_git.bb b/poky/meta/recipes-graphics/fstests/fstests_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/fstests/fstests_git.bb
rename to poky/meta/recipes-graphics/fstests/fstests_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/glew/glew/no-strip.patch b/poky/meta/recipes-graphics/glew/glew/no-strip.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/glew/glew/no-strip.patch
rename to poky/meta/recipes-graphics/glew/glew/no-strip.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/glew/glew_2.1.0.bb b/poky/meta/recipes-graphics/glew/glew_2.1.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/glew/glew_2.1.0.bb
rename to poky/meta/recipes-graphics/glew/glew_2.1.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/harfbuzz/harfbuzz_1.7.5.bb b/poky/meta/recipes-graphics/harfbuzz/harfbuzz_1.7.5.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/harfbuzz/harfbuzz_1.7.5.bb
rename to poky/meta/recipes-graphics/harfbuzz/harfbuzz_1.7.5.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/images/core-image-clutter.bb b/poky/meta/recipes-graphics/images/core-image-clutter.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/images/core-image-clutter.bb
rename to poky/meta/recipes-graphics/images/core-image-clutter.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/images/core-image-weston.bb b/poky/meta/recipes-graphics/images/core-image-weston.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/images/core-image-weston.bb
rename to poky/meta/recipes-graphics/images/core-image-weston.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/images/core-image-x11.bb b/poky/meta/recipes-graphics/images/core-image-x11.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/images/core-image-x11.bb
rename to poky/meta/recipes-graphics/images/core-image-x11.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.3.bb b/poky/meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.3.bb
rename to poky/meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/kmscube/kmscube/detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch b/poky/meta/recipes-graphics/kmscube/kmscube/detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/kmscube/kmscube/detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch
rename to poky/meta/recipes-graphics/kmscube/kmscube/detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/kmscube/kmscube_git.bb b/poky/meta/recipes-graphics/kmscube/kmscube_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/kmscube/kmscube_git.bb
rename to poky/meta/recipes-graphics/kmscube/kmscube_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy/no-tests.patch b/poky/meta/recipes-graphics/libepoxy/libepoxy/no-tests.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy/no-tests.patch
rename to poky/meta/recipes-graphics/libepoxy/libepoxy/no-tests.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy_1.5.0.bb b/poky/meta/recipes-graphics/libepoxy/libepoxy_1.5.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy_1.5.0.bb
rename to poky/meta/recipes-graphics/libepoxy/libepoxy_1.5.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/libfakekey/libfakekey_git.bb b/poky/meta/recipes-graphics/libfakekey/libfakekey_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/libfakekey/libfakekey_git.bb
rename to poky/meta/recipes-graphics/libfakekey/libfakekey_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/libmatchbox/libmatchbox_1.12.bb b/poky/meta/recipes-graphics/libmatchbox/libmatchbox_1.12.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/libmatchbox/libmatchbox_1.12.bb
rename to poky/meta/recipes-graphics/libmatchbox/libmatchbox_1.12.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/libsdl/libsdl-1.2.15/0001-build-Pass-tag-CC-explictly-when-using-libtool.patch b/poky/meta/recipes-graphics/libsdl/libsdl-1.2.15/0001-build-Pass-tag-CC-explictly-when-using-libtool.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/libsdl/libsdl-1.2.15/0001-build-Pass-tag-CC-explictly-when-using-libtool.patch
rename to poky/meta/recipes-graphics/libsdl/libsdl-1.2.15/0001-build-Pass-tag-CC-explictly-when-using-libtool.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/libsdl/libsdl-1.2.15/libsdl-1.2.15-xdata32.patch b/poky/meta/recipes-graphics/libsdl/libsdl-1.2.15/libsdl-1.2.15-xdata32.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/libsdl/libsdl-1.2.15/libsdl-1.2.15-xdata32.patch
rename to poky/meta/recipes-graphics/libsdl/libsdl-1.2.15/libsdl-1.2.15-xdata32.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/libsdl/libsdl-1.2.15/pkgconfig.patch b/poky/meta/recipes-graphics/libsdl/libsdl-1.2.15/pkgconfig.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/libsdl/libsdl-1.2.15/pkgconfig.patch
rename to poky/meta/recipes-graphics/libsdl/libsdl-1.2.15/pkgconfig.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb b/poky/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
rename to poky/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.8.bb b/poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.8.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.8.bb
rename to poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.8.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/libva/libva-utils_2.1.0.bb b/poky/meta/recipes-graphics/libva/libva-utils_2.1.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/libva/libva-utils_2.1.0.bb
rename to poky/meta/recipes-graphics/libva/libva-utils_2.1.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/libva/libva_2.1.0.bb b/poky/meta/recipes-graphics/libva/libva_2.1.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/libva/libva_2.1.0.bb
rename to poky/meta/recipes-graphics/libva/libva_2.1.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/matchbox-session/matchbox-session/matchbox-session b/poky/meta/recipes-graphics/matchbox-session/matchbox-session/matchbox-session
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/matchbox-session/matchbox-session/matchbox-session
rename to poky/meta/recipes-graphics/matchbox-session/matchbox-session/matchbox-session
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb b/poky/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb
rename to poky/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/matchbox-wm/matchbox-wm/kbdconfig b/poky/meta/recipes-graphics/matchbox-wm/matchbox-wm/kbdconfig
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/matchbox-wm/matchbox-wm/kbdconfig
rename to poky/meta/recipes-graphics/matchbox-wm/matchbox-wm/kbdconfig
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.2.bb b/poky/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.2.bb
rename to poky/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/menu-cache/menu-cache_1.0.2.bb b/poky/meta/recipes-graphics/menu-cache/menu-cache_1.0.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/menu-cache/menu-cache_1.0.2.bb
rename to poky/meta/recipes-graphics/menu-cache/menu-cache_1.0.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch b/poky/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch
rename to poky/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch b/poky/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch
rename to poky/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/0001-st-dri-Initialise-modifier-to-INVALID-for-DRI2.patch b/poky/meta/recipes-graphics/mesa/files/0001-st-dri-Initialise-modifier-to-INVALID-for-DRI2.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/mesa/files/0001-st-dri-Initialise-modifier-to-INVALID-for-DRI2.patch
rename to poky/meta/recipes-graphics/mesa/files/0001-st-dri-Initialise-modifier-to-INVALID-for-DRI2.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/0001-winsys-svga-drm-Include-sys-types.h.patch b/poky/meta/recipes-graphics/mesa/files/0001-winsys-svga-drm-Include-sys-types.h.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/mesa/files/0001-winsys-svga-drm-Include-sys-types.h.patch
rename to poky/meta/recipes-graphics/mesa/files/0001-winsys-svga-drm-Include-sys-types.h.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/0002-hardware-gloat.patch b/poky/meta/recipes-graphics/mesa/files/0002-hardware-gloat.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/mesa/files/0002-hardware-gloat.patch
rename to poky/meta/recipes-graphics/mesa/files/0002-hardware-gloat.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/Use-Python-3-to-execute-the-scripts.patch b/poky/meta/recipes-graphics/mesa/files/Use-Python-3-to-execute-the-scripts.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/mesa/files/Use-Python-3-to-execute-the-scripts.patch
rename to poky/meta/recipes-graphics/mesa/files/Use-Python-3-to-execute-the-scripts.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/disable-asm-on-non-gcc.patch b/poky/meta/recipes-graphics/mesa/files/disable-asm-on-non-gcc.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/mesa/files/disable-asm-on-non-gcc.patch
rename to poky/meta/recipes-graphics/mesa/files/disable-asm-on-non-gcc.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/llvm-config-version.patch b/poky/meta/recipes-graphics/mesa/files/llvm-config-version.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/mesa/files/llvm-config-version.patch
rename to poky/meta/recipes-graphics/mesa/files/llvm-config-version.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/libglu_9.0.0.bb b/poky/meta/recipes-graphics/mesa/libglu_9.0.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/mesa/libglu_9.0.0.bb
rename to poky/meta/recipes-graphics/mesa/libglu_9.0.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0001-mesa-demos-Add-missing-data-files.patch b/poky/meta/recipes-graphics/mesa/mesa-demos/0001-mesa-demos-Add-missing-data-files.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0001-mesa-demos-Add-missing-data-files.patch
rename to poky/meta/recipes-graphics/mesa/mesa-demos/0001-mesa-demos-Add-missing-data-files.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch b/poky/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch
rename to poky/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0004-Use-DEMOS_DATA_DIR-to-locate-data-files.patch b/poky/meta/recipes-graphics/mesa/mesa-demos/0004-Use-DEMOS_DATA_DIR-to-locate-data-files.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0004-Use-DEMOS_DATA_DIR-to-locate-data-files.patch
rename to poky/meta/recipes-graphics/mesa/mesa-demos/0004-Use-DEMOS_DATA_DIR-to-locate-data-files.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0007-Install-few-more-test-programs.patch b/poky/meta/recipes-graphics/mesa/mesa-demos/0007-Install-few-more-test-programs.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0007-Install-few-more-test-programs.patch
rename to poky/meta/recipes-graphics/mesa/mesa-demos/0007-Install-few-more-test-programs.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch b/poky/meta/recipes-graphics/mesa/mesa-demos/0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch
rename to poky/meta/recipes-graphics/mesa/mesa-demos/0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch b/poky/meta/recipes-graphics/mesa/mesa-demos/0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch
rename to poky/meta/recipes-graphics/mesa/mesa-demos/0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0012-mesa-demos-OpenVG-demos-with-single-frame-need-eglSw.patch b/poky/meta/recipes-graphics/mesa/mesa-demos/0012-mesa-demos-OpenVG-demos-with-single-frame-need-eglSw.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0012-mesa-demos-OpenVG-demos-with-single-frame-need-eglSw.patch
rename to poky/meta/recipes-graphics/mesa/mesa-demos/0012-mesa-demos-OpenVG-demos-with-single-frame-need-eglSw.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0013-only-build-GLX-demos-if-needed.patch b/poky/meta/recipes-graphics/mesa/mesa-demos/0013-only-build-GLX-demos-if-needed.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0013-only-build-GLX-demos-if-needed.patch
rename to poky/meta/recipes-graphics/mesa/mesa-demos/0013-only-build-GLX-demos-if-needed.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos_8.3.0.bb b/poky/meta/recipes-graphics/mesa/mesa-demos_8.3.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos_8.3.0.bb
rename to poky/meta/recipes-graphics/mesa/mesa-demos_8.3.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-gl_17.3.8.bb b/poky/meta/recipes-graphics/mesa/mesa-gl_17.3.8.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-gl_17.3.8.bb
rename to poky/meta/recipes-graphics/mesa/mesa-gl_17.3.8.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa.inc b/poky/meta/recipes-graphics/mesa/mesa.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa.inc
rename to poky/meta/recipes-graphics/mesa/mesa.inc
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa_17.3.8.bb b/poky/meta/recipes-graphics/mesa/mesa_17.3.8.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa_17.3.8.bb
rename to poky/meta/recipes-graphics/mesa/mesa_17.3.8.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mini-x-session/files/mini-x-session b/poky/meta/recipes-graphics/mini-x-session/files/mini-x-session
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/mini-x-session/files/mini-x-session
rename to poky/meta/recipes-graphics/mini-x-session/files/mini-x-session
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb b/poky/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb
rename to poky/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mx/mx-1.0/fix-test-includes.patch b/poky/meta/recipes-graphics/mx/mx-1.0/fix-test-includes.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/mx/mx-1.0/fix-test-includes.patch
rename to poky/meta/recipes-graphics/mx/mx-1.0/fix-test-includes.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb b/poky/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb
rename to poky/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mx/mx.inc b/poky/meta/recipes-graphics/mx/mx.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/mx/mx.inc
rename to poky/meta/recipes-graphics/mx/mx.inc
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb b/poky/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
rename to poky/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb b/poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb
rename to poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb b/poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb
rename to poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb b/poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb
rename to poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/pango/pango/0001-Drop-introspection-macros-from-acinclude.m4.patch b/poky/meta/recipes-graphics/pango/pango/0001-Drop-introspection-macros-from-acinclude.m4.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/pango/pango/0001-Drop-introspection-macros-from-acinclude.m4.patch
rename to poky/meta/recipes-graphics/pango/pango/0001-Drop-introspection-macros-from-acinclude.m4.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/pango/pango/0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch b/poky/meta/recipes-graphics/pango/pango/0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/pango/pango/0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch
rename to poky/meta/recipes-graphics/pango/pango/0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/pango/pango/run-ptest b/poky/meta/recipes-graphics/pango/pango/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/pango/pango/run-ptest
rename to poky/meta/recipes-graphics/pango/pango/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/pango/pango_1.40.14.bb b/poky/meta/recipes-graphics/pango/pango_1.40.14.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/pango/pango_1.40.14.bb
rename to poky/meta/recipes-graphics/pango/pango_1.40.14.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch b/poky/meta/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch
rename to poky/meta/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit/0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch b/poky/meta/recipes-graphics/piglit/piglit/0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit/0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch
rename to poky/meta/recipes-graphics/piglit/piglit/0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit_git.bb b/poky/meta/recipes-graphics/piglit/piglit_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit_git.bb
rename to poky/meta/recipes-graphics/piglit/piglit_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/pong-clock/pong-clock/pong-clock-no-flicker.c b/poky/meta/recipes-graphics/pong-clock/pong-clock/pong-clock-no-flicker.c
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/pong-clock/pong-clock/pong-clock-no-flicker.c
rename to poky/meta/recipes-graphics/pong-clock/pong-clock/pong-clock-no-flicker.c
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb b/poky/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb
rename to poky/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/startup-notification/startup-notification-0.12/obsolete_automake_macros.patch b/poky/meta/recipes-graphics/startup-notification/startup-notification-0.12/obsolete_automake_macros.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/startup-notification/startup-notification-0.12/obsolete_automake_macros.patch
rename to poky/meta/recipes-graphics/startup-notification/startup-notification-0.12/obsolete_automake_macros.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/startup-notification/startup-notification_0.12.bb b/poky/meta/recipes-graphics/startup-notification/startup-notification_0.12.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/startup-notification/startup-notification_0.12.bb
rename to poky/meta/recipes-graphics/startup-notification/startup-notification_0.12.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/ttf-fonts/liberation-fonts/30-liberation-aliases.conf b/poky/meta/recipes-graphics/ttf-fonts/liberation-fonts/30-liberation-aliases.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/ttf-fonts/liberation-fonts/30-liberation-aliases.conf
rename to poky/meta/recipes-graphics/ttf-fonts/liberation-fonts/30-liberation-aliases.conf
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/ttf-fonts/liberation-fonts_2.00.1.bb b/poky/meta/recipes-graphics/ttf-fonts/liberation-fonts_2.00.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/ttf-fonts/liberation-fonts_2.00.1.bb
rename to poky/meta/recipes-graphics/ttf-fonts/liberation-fonts_2.00.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb b/poky/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb
rename to poky/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/vulkan/assimp_4.1.0.bb b/poky/meta/recipes-graphics/vulkan/assimp_4.1.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/vulkan/assimp_4.1.0.bb
rename to poky/meta/recipes-graphics/vulkan/assimp_4.1.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/vulkan/vulkan-demos/0001-Don-t-build-demos-with-questionably-licensed-data.patch b/poky/meta/recipes-graphics/vulkan/vulkan-demos/0001-Don-t-build-demos-with-questionably-licensed-data.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/vulkan/vulkan-demos/0001-Don-t-build-demos-with-questionably-licensed-data.patch
rename to poky/meta/recipes-graphics/vulkan/vulkan-demos/0001-Don-t-build-demos-with-questionably-licensed-data.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/vulkan/vulkan-demos/0001-Fix-build-on-x86.patch b/poky/meta/recipes-graphics/vulkan/vulkan-demos/0001-Fix-build-on-x86.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/vulkan/vulkan-demos/0001-Fix-build-on-x86.patch
rename to poky/meta/recipes-graphics/vulkan/vulkan-demos/0001-Fix-build-on-x86.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/vulkan/vulkan-demos/0001-Support-installing-demos-support-out-of-tree-builds.patch b/poky/meta/recipes-graphics/vulkan/vulkan-demos/0001-Support-installing-demos-support-out-of-tree-builds.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/vulkan/vulkan-demos/0001-Support-installing-demos-support-out-of-tree-builds.patch
rename to poky/meta/recipes-graphics/vulkan/vulkan-demos/0001-Support-installing-demos-support-out-of-tree-builds.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/vulkan/vulkan-demos_git.bb b/poky/meta/recipes-graphics/vulkan/vulkan-demos_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/vulkan/vulkan-demos_git.bb
rename to poky/meta/recipes-graphics/vulkan/vulkan-demos_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/vulkan/vulkan/demos-Don-t-build-tri-or-cube.patch b/poky/meta/recipes-graphics/vulkan/vulkan/demos-Don-t-build-tri-or-cube.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/vulkan/vulkan/demos-Don-t-build-tri-or-cube.patch
rename to poky/meta/recipes-graphics/vulkan/vulkan/demos-Don-t-build-tri-or-cube.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/vulkan/vulkan_1.0.65.2.bb b/poky/meta/recipes-graphics/vulkan/vulkan_1.0.65.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/vulkan/vulkan_1.0.65.2.bb
rename to poky/meta/recipes-graphics/vulkan/vulkan_1.0.65.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/waffle/waffle/0001-third_party-threads-Use-PTHREAD_MUTEX_RECURSIVE-by-d.patch b/poky/meta/recipes-graphics/waffle/waffle/0001-third_party-threads-Use-PTHREAD_MUTEX_RECURSIVE-by-d.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/waffle/waffle/0001-third_party-threads-Use-PTHREAD_MUTEX_RECURSIVE-by-d.patch
rename to poky/meta/recipes-graphics/waffle/waffle/0001-third_party-threads-Use-PTHREAD_MUTEX_RECURSIVE-by-d.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/waffle/waffle_1.5.2.bb b/poky/meta/recipes-graphics/waffle/waffle_1.5.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/waffle/waffle_1.5.2.bb
rename to poky/meta/recipes-graphics/waffle/waffle_1.5.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/libinput_1.9.4.bb b/poky/meta/recipes-graphics/wayland/libinput_1.9.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/wayland/libinput_1.9.4.bb
rename to poky/meta/recipes-graphics/wayland/libinput_1.9.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/mtdev_1.1.5.bb b/poky/meta/recipes-graphics/wayland/mtdev_1.1.5.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/wayland/mtdev_1.1.5.bb
rename to poky/meta/recipes-graphics/wayland/mtdev_1.1.5.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/wayland-protocols_1.13.bb b/poky/meta/recipes-graphics/wayland/wayland-protocols_1.13.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/wayland/wayland-protocols_1.13.bb
rename to poky/meta/recipes-graphics/wayland/wayland-protocols_1.13.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch b/poky/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch
rename to poky/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/wayland_1.14.0.bb b/poky/meta/recipes-graphics/wayland/wayland_1.14.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/wayland/wayland_1.14.0.bb
rename to poky/meta/recipes-graphics/wayland/wayland_1.14.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston-init.bb b/poky/meta/recipes-graphics/wayland/weston-init.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/wayland/weston-init.bb
rename to poky/meta/recipes-graphics/wayland/weston-init.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston-init/init b/poky/meta/recipes-graphics/wayland/weston-init/init
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/wayland/weston-init/init
rename to poky/meta/recipes-graphics/wayland/weston-init/init
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston-init/weston-start b/poky/meta/recipes-graphics/wayland/weston-init/weston-start
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/wayland/weston-init/weston-start
rename to poky/meta/recipes-graphics/wayland/weston-init/weston-start
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston-init/weston.service b/poky/meta/recipes-graphics/wayland/weston-init/weston.service
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/wayland/weston-init/weston.service
rename to poky/meta/recipes-graphics/wayland/weston-init/weston.service
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch b/poky/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
rename to poky/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch b/poky/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
rename to poky/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/fix-missing-header.patch b/poky/meta/recipes-graphics/wayland/weston/fix-missing-header.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/fix-missing-header.patch
rename to poky/meta/recipes-graphics/wayland/weston/fix-missing-header.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/weston-gl-renderer-Set-pitch-correctly-for-subsampled-textures.patch b/poky/meta/recipes-graphics/wayland/weston/weston-gl-renderer-Set-pitch-correctly-for-subsampled-textures.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/weston-gl-renderer-Set-pitch-correctly-for-subsampled-textures.patch
rename to poky/meta/recipes-graphics/wayland/weston/weston-gl-renderer-Set-pitch-correctly-for-subsampled-textures.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/weston.desktop b/poky/meta/recipes-graphics/wayland/weston/weston.desktop
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/weston.desktop
rename to poky/meta/recipes-graphics/wayland/weston/weston.desktop
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/weston.png b/poky/meta/recipes-graphics/wayland/weston/weston.png
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/weston.png
rename to poky/meta/recipes-graphics/wayland/weston/weston.png
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/xwayland.weston-start b/poky/meta/recipes-graphics/wayland/weston/xwayland.weston-start
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/xwayland.weston-start
rename to poky/meta/recipes-graphics/wayland/weston/xwayland.weston-start
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston_3.0.0.bb b/poky/meta/recipes-graphics/wayland/weston_3.0.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/wayland/weston_3.0.0.bb
rename to poky/meta/recipes-graphics/wayland/weston_3.0.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession b/poky/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession
rename to poky/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/13xdgbasedirs.sh b/poky/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/13xdgbasedirs.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/13xdgbasedirs.sh
rename to poky/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/13xdgbasedirs.sh
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/89xdgautostart.sh b/poky/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/89xdgautostart.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/89xdgautostart.sh
rename to poky/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/89xdgautostart.sh
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/90XWindowManager.sh b/poky/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/90XWindowManager.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/90XWindowManager.sh
rename to poky/meta/recipes-graphics/x11-common/xserver-nodm-init/X11/Xsession.d/90XWindowManager.sh
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/Xserver b/poky/meta/recipes-graphics/x11-common/xserver-nodm-init/Xserver
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/Xserver
rename to poky/meta/recipes-graphics/x11-common/xserver-nodm-init/Xserver
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/gplv2-license.patch b/poky/meta/recipes-graphics/x11-common/xserver-nodm-init/gplv2-license.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/gplv2-license.patch
rename to poky/meta/recipes-graphics/x11-common/xserver-nodm-init/gplv2-license.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm b/poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
rename to poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf.in b/poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf.in
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf.in
rename to poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf.in
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.service.in b/poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.service.in
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.service.in
rename to poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.service.in
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb b/poky/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb
rename to poky/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_git.bb b/poky/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_git.bb
rename to poky/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput b/poky/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput
rename to poky/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/qemuall/pointercal.xinput b/poky/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/qemuall/pointercal.xinput
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/qemuall/pointercal.xinput
rename to poky/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/qemuall/pointercal.xinput
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb b/poky/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
rename to poky/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/30xinput_calibrate.sh b/poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/30xinput_calibrate.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/30xinput_calibrate.sh
rename to poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/30xinput_calibrate.sh
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch b/poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch
rename to poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb b/poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
rename to poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb b/poky/meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb
rename to poky/meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-app/mkfontscale_1.1.2.bb b/poky/meta/recipes-graphics/xorg-app/mkfontscale_1.1.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-app/mkfontscale_1.1.2.bb
rename to poky/meta/recipes-graphics/xorg-app/mkfontscale_1.1.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-app/rgb_1.0.6.bb b/poky/meta/recipes-graphics/xorg-app/rgb_1.0.6.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-app/rgb_1.0.6.bb
rename to poky/meta/recipes-graphics/xorg-app/rgb_1.0.6.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-app/x11perf_1.6.0.bb b/poky/meta/recipes-graphics/xorg-app/x11perf_1.6.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-app/x11perf_1.6.0.bb
rename to poky/meta/recipes-graphics/xorg-app/x11perf_1.6.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xauth_1.0.10.bb b/poky/meta/recipes-graphics/xorg-app/xauth_1.0.10.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xauth_1.0.10.bb
rename to poky/meta/recipes-graphics/xorg-app/xauth_1.0.10.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xdpyinfo/disable-xkb.patch b/poky/meta/recipes-graphics/xorg-app/xdpyinfo/disable-xkb.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xdpyinfo/disable-xkb.patch
rename to poky/meta/recipes-graphics/xorg-app/xdpyinfo/disable-xkb.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb b/poky/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb
rename to poky/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xev/diet-x11.patch b/poky/meta/recipes-graphics/xorg-app/xev/diet-x11.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xev/diet-x11.patch
rename to poky/meta/recipes-graphics/xorg-app/xev/diet-x11.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xev_1.2.2.bb b/poky/meta/recipes-graphics/xorg-app/xev_1.2.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xev_1.2.2.bb
rename to poky/meta/recipes-graphics/xorg-app/xev_1.2.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb b/poky/meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb
rename to poky/meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xhost_1.0.7.bb b/poky/meta/recipes-graphics/xorg-app/xhost_1.0.7.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xhost_1.0.7.bb
rename to poky/meta/recipes-graphics/xorg-app/xhost_1.0.7.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xinit_1.3.4.bb b/poky/meta/recipes-graphics/xorg-app/xinit_1.3.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xinit_1.3.4.bb
rename to poky/meta/recipes-graphics/xorg-app/xinit_1.3.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xinput_1.6.2.bb b/poky/meta/recipes-graphics/xorg-app/xinput_1.6.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xinput_1.6.2.bb
rename to poky/meta/recipes-graphics/xorg-app/xinput_1.6.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xkbcomp_1.4.0.bb b/poky/meta/recipes-graphics/xorg-app/xkbcomp_1.4.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xkbcomp_1.4.0.bb
rename to poky/meta/recipes-graphics/xorg-app/xkbcomp_1.4.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xmodmap_1.0.9.bb b/poky/meta/recipes-graphics/xorg-app/xmodmap_1.0.9.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xmodmap_1.0.9.bb
rename to poky/meta/recipes-graphics/xorg-app/xmodmap_1.0.9.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xorg-app-common.inc b/poky/meta/recipes-graphics/xorg-app/xorg-app-common.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xorg-app-common.inc
rename to poky/meta/recipes-graphics/xorg-app/xorg-app-common.inc
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xprop_1.2.2.bb b/poky/meta/recipes-graphics/xorg-app/xprop_1.2.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xprop_1.2.2.bb
rename to poky/meta/recipes-graphics/xorg-app/xprop_1.2.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xrandr_1.5.0.bb b/poky/meta/recipes-graphics/xorg-app/xrandr_1.5.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xrandr_1.5.0.bb
rename to poky/meta/recipes-graphics/xorg-app/xrandr_1.5.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch b/poky/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch
rename to poky/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xset_1.2.3.bb b/poky/meta/recipes-graphics/xorg-app/xset_1.2.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xset_1.2.3.bb
rename to poky/meta/recipes-graphics/xorg-app/xset_1.2.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xvinfo_1.1.3.bb b/poky/meta/recipes-graphics/xorg-app/xvinfo_1.1.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xvinfo_1.1.3.bb
rename to poky/meta/recipes-graphics/xorg-app/xvinfo_1.1.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb b/poky/meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb
rename to poky/meta/recipes-graphics/xorg-app/xwininfo_1.1.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.10.5.bb b/poky/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.10.5.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.10.5.bb
rename to poky/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.10.5.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.9.0.bb b/poky/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.9.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.9.0.bb
rename to poky/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.9.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.26.0.bb b/poky/meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.26.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.26.0.bb
rename to poky/meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.26.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.2.bb b/poky/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.2.bb
rename to poky/meta/recipes-graphics/xorg-driver/xf86-input-mouse_1.9.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.9.0.bb b/poky/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.9.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.9.0.bb
rename to poky/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.9.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb b/poky/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb
rename to poky/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-cirrus_1.5.3.bb b/poky/meta/recipes-graphics/xorg-driver/xf86-video-cirrus_1.5.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-cirrus_1.5.3.bb
rename to poky/meta/recipes-graphics/xorg-driver/xf86-video-cirrus_1.5.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.4.bb b/poky/meta/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.4.bb
rename to poky/meta/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-Add-Coffeelake-PCI-IDs-for-S-Skus.patch b/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-Add-Coffeelake-PCI-IDs-for-S-Skus.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-Add-Coffeelake-PCI-IDs-for-S-Skus.patch
rename to poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-Add-Coffeelake-PCI-IDs-for-S-Skus.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/always_include_xorg_server.h.patch b/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/always_include_xorg_server.h.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/always_include_xorg_server.h.patch
rename to poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/always_include_xorg_server.h.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch b/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch
rename to poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb b/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
rename to poky/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.5.bb b/poky/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.5.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.5.bb
rename to poky/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.5.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-Prevents-omapfb-from-from-crashing-when-pixelclock-o.patch b/poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-Prevents-omapfb-from-from-crashing-when-pixelclock-o.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-Prevents-omapfb-from-from-crashing-when-pixelclock-o.patch
rename to poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-Prevents-omapfb-from-from-crashing-when-pixelclock-o.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-Revert-Set-a-large-CRTC-upper-limit-to-not-prune-lar.patch b/poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-Revert-Set-a-large-CRTC-upper-limit-to-not-prune-lar.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-Revert-Set-a-large-CRTC-upper-limit-to-not-prune-lar.patch
rename to poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0001-Revert-Set-a-large-CRTC-upper-limit-to-not-prune-lar.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch b/poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch
rename to poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0003-force-plain-mode.patch b/poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0003-force-plain-mode.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0003-force-plain-mode.patch
rename to poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0003-force-plain-mode.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-blacklist-tv-out.patch b/poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-blacklist-tv-out.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-blacklist-tv-out.patch
rename to poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0004-blacklist-tv-out.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0005-Attempt-to-fix-VRFB.patch b/poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0005-Attempt-to-fix-VRFB.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0005-Attempt-to-fix-VRFB.patch
rename to poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0005-Attempt-to-fix-VRFB.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0006-omapfb-port-to-new-xserver-video-API.patch b/poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0006-omapfb-port-to-new-xserver-video-API.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0006-omapfb-port-to-new-xserver-video-API.patch
rename to poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0006-omapfb-port-to-new-xserver-video-API.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0007-always_include_xorg_server.h.patch b/poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0007-always_include_xorg_server.h.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0007-always_include_xorg_server.h.patch
rename to poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0007-always_include_xorg_server.h.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb b/poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
rename to poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.4.bb b/poky/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.4.bb
rename to poky/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.3.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch b/poky/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch
rename to poky/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.2.1.bb b/poky/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.2.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.2.1.bb
rename to poky/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.2.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc b/poky/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
rename to poky/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc b/poky/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc
rename to poky/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-video.inc b/poky/meta/recipes-graphics/xorg-driver/xorg-driver-video.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-video.inc
rename to poky/meta/recipes-graphics/xorg-driver/xorg-driver-video.inc
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch b/poky/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch
rename to poky/meta/recipes-graphics/xorg-font/encodings/nocompiler.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/encodings_1.0.4.bb b/poky/meta/recipes-graphics/xorg-font/encodings_1.0.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/encodings_1.0.4.bb
rename to poky/meta/recipes-graphics/xorg-font/encodings_1.0.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/font-alias-1.0.3/nocompiler.patch b/poky/meta/recipes-graphics/xorg-font/font-alias-1.0.3/nocompiler.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/font-alias-1.0.3/nocompiler.patch
rename to poky/meta/recipes-graphics/xorg-font/font-alias-1.0.3/nocompiler.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb b/poky/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb
rename to poky/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/font-util_1.3.1.bb b/poky/meta/recipes-graphics/xorg-font/font-util_1.3.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/font-util_1.3.1.bb
rename to poky/meta/recipes-graphics/xorg-font/font-util_1.3.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-font-common.inc b/poky/meta/recipes-graphics/xorg-font/xorg-font-common.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-font-common.inc
rename to poky/meta/recipes-graphics/xorg-font/xorg-font-common.inc
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-1.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-1.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-1.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-1.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-10.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-10.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-10.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-10.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-11.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-11.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-11.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-11.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-13.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-13.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-13.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-13.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-14.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-14.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-14.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-14.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-15.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-15.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-15.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-15.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-16.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-16.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-16.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-16.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-2.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-2.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-2.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-2.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-3.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-3.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-3.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-3.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-4.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-4.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-4.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-4.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-5.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-5.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-5.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-5.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-7.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-7.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-7.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-7.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-8.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-8.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-8.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-8.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-9.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-9.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-9.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-ISO8859-9.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-KOI8-R.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-KOI8-R.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-KOI8-R.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13-KOI8-R.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-1.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-1.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-1.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-1.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-10.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-10.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-10.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-10.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-13.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-13.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-13.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-13.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-14.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-14.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-14.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-14.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-15.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-15.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-15.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-15.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-16.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-16.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-16.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-16.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-2.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-2.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-2.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-2.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-3.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-3.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-3.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-3.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-4.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-4.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-4.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-4.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-5.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-5.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-5.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-5.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-7.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-7.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-7.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-7.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-8.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-8.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-8.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-8.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-9.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-9.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-9.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B-ISO8859-9.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13B.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-1.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-1.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-1.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-1.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-10.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-10.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-10.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-10.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-13.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-13.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-13.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-13.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-14.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-14.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-14.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-14.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-15.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-15.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-15.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-15.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-16.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-16.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-16.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-16.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-2.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-2.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-2.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-2.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-3.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-3.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-3.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-3.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-4.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-4.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-4.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-4.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-5.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-5.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-5.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-5.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-7.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-7.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-7.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-7.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-9.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-9.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-9.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O-ISO8859-9.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/6x13O.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/cursor.pcf.gz b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/cursor.pcf.gz
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/cursor.pcf.gz
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/cursor.pcf.gz
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/fonts.dir b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/fonts.dir
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/fonts.dir
rename to poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts/misc/fonts.dir
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libdmx_1.1.3.bb b/poky/meta/recipes-graphics/xorg-lib/libdmx_1.1.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libdmx_1.1.3.bb
rename to poky/meta/recipes-graphics/xorg-lib/libdmx_1.1.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libfontenc_1.1.3.bb b/poky/meta/recipes-graphics/xorg-lib/libfontenc_1.1.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libfontenc_1.1.3.bb
rename to poky/meta/recipes-graphics/xorg-lib/libfontenc_1.1.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libice_1.0.9.bb b/poky/meta/recipes-graphics/xorg-lib/libice_1.0.9.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libice_1.0.9.bb
rename to poky/meta/recipes-graphics/xorg-lib/libice_1.0.9.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess/0004-Don-t-include-sys-io.h-on-arm.patch b/poky/meta/recipes-graphics/xorg-lib/libpciaccess/0004-Don-t-include-sys-io.h-on-arm.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess/0004-Don-t-include-sys-io.h-on-arm.patch
rename to poky/meta/recipes-graphics/xorg-lib/libpciaccess/0004-Don-t-include-sys-io.h-on-arm.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess_0.14.bb b/poky/meta/recipes-graphics/xorg-lib/libpciaccess_0.14.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess_0.14.bb
rename to poky/meta/recipes-graphics/xorg-lib/libpciaccess_0.14.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.4.bb b/poky/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.4.bb
rename to poky/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb b/poky/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb
rename to poky/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.5.bb b/poky/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.5.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.5.bb
rename to poky/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.5.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libx11.inc b/poky/meta/recipes-graphics/xorg-lib/libx11.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libx11.inc
rename to poky/meta/recipes-graphics/xorg-lib/libx11.inc
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch b/poky/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch
rename to poky/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff b/poky/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
rename to poky/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch b/poky/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch
rename to poky/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff b/poky/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff
rename to poky/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch b/poky/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch
rename to poky/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libx11_1.6.5.bb b/poky/meta/recipes-graphics/xorg-lib/libx11_1.6.5.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libx11_1.6.5.bb
rename to poky/meta/recipes-graphics/xorg-lib/libx11_1.6.5.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxau_1.0.8.bb b/poky/meta/recipes-graphics/xorg-lib/libxau_1.0.8.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxau_1.0.8.bb
rename to poky/meta/recipes-graphics/xorg-lib/libxau_1.0.8.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch b/poky/meta/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch
rename to poky/meta/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb b/poky/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb
rename to poky/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb/Fix-inconsistent-use-of-tabs-vs.-space.patch b/poky/meta/recipes-graphics/xorg-lib/libxcb/Fix-inconsistent-use-of-tabs-vs.-space.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb/Fix-inconsistent-use-of-tabs-vs.-space.patch
rename to poky/meta/recipes-graphics/xorg-lib/libxcb/Fix-inconsistent-use-of-tabs-vs.-space.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch b/poky/meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch
rename to poky/meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb/gcc-mips-pr68302-mips-workaround.patch b/poky/meta/recipes-graphics/xorg-lib/libxcb/gcc-mips-pr68302-mips-workaround.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb/gcc-mips-pr68302-mips-workaround.patch
rename to poky/meta/recipes-graphics/xorg-lib/libxcb/gcc-mips-pr68302-mips-workaround.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb/xcbincludedir.patch b/poky/meta/recipes-graphics/xorg-lib/libxcb/xcbincludedir.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb/xcbincludedir.patch
rename to poky/meta/recipes-graphics/xorg-lib/libxcb/xcbincludedir.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb_1.12.bb b/poky/meta/recipes-graphics/xorg-lib/libxcb_1.12.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb_1.12.bb
rename to poky/meta/recipes-graphics/xorg-lib/libxcb_1.12.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch b/poky/meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch
rename to poky/meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.4.bb b/poky/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.4.bb
rename to poky/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcursor_1.1.15.bb b/poky/meta/recipes-graphics/xorg-lib/libxcursor_1.1.15.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcursor_1.1.15.bb
rename to poky/meta/recipes-graphics/xorg-lib/libxcursor_1.1.15.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxdamage_1.1.4.bb b/poky/meta/recipes-graphics/xorg-lib/libxdamage_1.1.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxdamage_1.1.4.bb
rename to poky/meta/recipes-graphics/xorg-lib/libxdamage_1.1.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.2.bb b/poky/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.2.bb
rename to poky/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxext_1.3.3.bb b/poky/meta/recipes-graphics/xorg-lib/libxext_1.3.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxext_1.3.3.bb
rename to poky/meta/recipes-graphics/xorg-lib/libxext_1.3.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxfixes_5.0.3.bb b/poky/meta/recipes-graphics/xorg-lib/libxfixes_5.0.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxfixes_5.0.3.bb
rename to poky/meta/recipes-graphics/xorg-lib/libxfixes_5.0.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxfont2_2.0.3.bb b/poky/meta/recipes-graphics/xorg-lib/libxfont2_2.0.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxfont2_2.0.3.bb
rename to poky/meta/recipes-graphics/xorg-lib/libxfont2_2.0.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxfont_1.5.4.bb b/poky/meta/recipes-graphics/xorg-lib/libxfont_1.5.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxfont_1.5.4.bb
rename to poky/meta/recipes-graphics/xorg-lib/libxfont_1.5.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxft_2.3.2.bb b/poky/meta/recipes-graphics/xorg-lib/libxft_2.3.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxft_2.3.2.bb
rename to poky/meta/recipes-graphics/xorg-lib/libxft_2.3.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxi_1.7.9.bb b/poky/meta/recipes-graphics/xorg-lib/libxi_1.7.9.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxi_1.7.9.bb
rename to poky/meta/recipes-graphics/xorg-lib/libxi_1.7.9.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxinerama_1.1.3.bb b/poky/meta/recipes-graphics/xorg-lib/libxinerama_1.1.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxinerama_1.1.3.bb
rename to poky/meta/recipes-graphics/xorg-lib/libxinerama_1.1.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxkbcommon_0.8.0.bb b/poky/meta/recipes-graphics/xorg-lib/libxkbcommon_0.8.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxkbcommon_0.8.0.bb
rename to poky/meta/recipes-graphics/xorg-lib/libxkbcommon_0.8.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxkbfile_1.0.9.bb b/poky/meta/recipes-graphics/xorg-lib/libxkbfile_1.0.9.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxkbfile_1.0.9.bb
rename to poky/meta/recipes-graphics/xorg-lib/libxkbfile_1.0.9.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb b/poky/meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb
rename to poky/meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxpm_3.5.12.bb b/poky/meta/recipes-graphics/xorg-lib/libxpm_3.5.12.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxpm_3.5.12.bb
rename to poky/meta/recipes-graphics/xorg-lib/libxpm_3.5.12.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxrandr_1.5.1.bb b/poky/meta/recipes-graphics/xorg-lib/libxrandr_1.5.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxrandr_1.5.1.bb
rename to poky/meta/recipes-graphics/xorg-lib/libxrandr_1.5.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxrender_0.9.10.bb b/poky/meta/recipes-graphics/xorg-lib/libxrender_0.9.10.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxrender_0.9.10.bb
rename to poky/meta/recipes-graphics/xorg-lib/libxrender_0.9.10.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxres_1.2.0.bb b/poky/meta/recipes-graphics/xorg-lib/libxres_1.2.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxres_1.2.0.bb
rename to poky/meta/recipes-graphics/xorg-lib/libxres_1.2.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.2.bb b/poky/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.2.bb
rename to poky/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxshmfence/extensions.patch b/poky/meta/recipes-graphics/xorg-lib/libxshmfence/extensions.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxshmfence/extensions.patch
rename to poky/meta/recipes-graphics/xorg-lib/libxshmfence/extensions.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxshmfence_1.2.bb b/poky/meta/recipes-graphics/xorg-lib/libxshmfence_1.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxshmfence_1.2.bb
rename to poky/meta/recipes-graphics/xorg-lib/libxshmfence_1.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxt/0001-libXt-util-don-t-link-makestrs-with-target-cflags.patch b/poky/meta/recipes-graphics/xorg-lib/libxt/0001-libXt-util-don-t-link-makestrs-with-target-cflags.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxt/0001-libXt-util-don-t-link-makestrs-with-target-cflags.patch
rename to poky/meta/recipes-graphics/xorg-lib/libxt/0001-libXt-util-don-t-link-makestrs-with-target-cflags.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch b/poky/meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch
rename to poky/meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb b/poky/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb
rename to poky/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxtst_1.2.3.bb b/poky/meta/recipes-graphics/xorg-lib/libxtst_1.2.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxtst_1.2.3.bb
rename to poky/meta/recipes-graphics/xorg-lib/libxtst_1.2.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxv_1.0.11.bb b/poky/meta/recipes-graphics/xorg-lib/libxv_1.0.11.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxv_1.0.11.bb
rename to poky/meta/recipes-graphics/xorg-lib/libxv_1.0.11.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxvmc_1.0.10.bb b/poky/meta/recipes-graphics/xorg-lib/libxvmc_1.0.10.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxvmc_1.0.10.bb
rename to poky/meta/recipes-graphics/xorg-lib/libxvmc_1.0.10.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.4.bb b/poky/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.4.bb
rename to poky/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.3.bb b/poky/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.3.bb
rename to poky/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.4.bb b/poky/meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.4.bb
rename to poky/meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch b/poky/meta/recipes-graphics/xorg-lib/pixman/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch
rename to poky/meta/recipes-graphics/xorg-lib/pixman/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch b/poky/meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch
rename to poky/meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/asm_include.patch b/poky/meta/recipes-graphics/xorg-lib/pixman/asm_include.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/asm_include.patch
rename to poky/meta/recipes-graphics/xorg-lib/pixman/asm_include.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb b/poky/meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb
rename to poky/meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-image/clang.patch b/poky/meta/recipes-graphics/xorg-lib/xcb-util-image/clang.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-image/clang.patch
rename to poky/meta/recipes-graphics/xorg-lib/xcb-util-image/clang.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-image_0.4.0.bb b/poky/meta/recipes-graphics/xorg-lib/xcb-util-image_0.4.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-image_0.4.0.bb
rename to poky/meta/recipes-graphics/xorg-lib/xcb-util-image_0.4.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-keysyms_0.4.0.bb b/poky/meta/recipes-graphics/xorg-lib/xcb-util-keysyms_0.4.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-keysyms_0.4.0.bb
rename to poky/meta/recipes-graphics/xorg-lib/xcb-util-keysyms_0.4.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-renderutil_0.3.9.bb b/poky/meta/recipes-graphics/xorg-lib/xcb-util-renderutil_0.3.9.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-renderutil_0.3.9.bb
rename to poky/meta/recipes-graphics/xorg-lib/xcb-util-renderutil_0.3.9.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-wm_0.4.1.bb b/poky/meta/recipes-graphics/xorg-lib/xcb-util-wm_0.4.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-wm_0.4.1.bb
rename to poky/meta/recipes-graphics/xorg-lib/xcb-util-wm_0.4.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util.inc b/poky/meta/recipes-graphics/xorg-lib/xcb-util.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util.inc
rename to poky/meta/recipes-graphics/xorg-lib/xcb-util.inc
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util_0.4.0.bb b/poky/meta/recipes-graphics/xorg-lib/xcb-util_0.4.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util_0.4.0.bb
rename to poky/meta/recipes-graphics/xorg-lib/xcb-util_0.4.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.22.bb b/poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.22.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.22.bb
rename to poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.22.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc b/poky/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc
rename to poky/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb b/poky/meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb
rename to poky/meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/bigreqsproto_1.1.2.bb b/poky/meta/recipes-graphics/xorg-proto/bigreqsproto_1.1.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/bigreqsproto_1.1.2.bb
rename to poky/meta/recipes-graphics/xorg-proto/bigreqsproto_1.1.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/calibrateproto/fix.patch b/poky/meta/recipes-graphics/xorg-proto/calibrateproto/fix.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/calibrateproto/fix.patch
rename to poky/meta/recipes-graphics/xorg-proto/calibrateproto/fix.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/calibrateproto_git.bb b/poky/meta/recipes-graphics/xorg-proto/calibrateproto_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/calibrateproto_git.bb
rename to poky/meta/recipes-graphics/xorg-proto/calibrateproto_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/compositeproto_0.4.2.bb b/poky/meta/recipes-graphics/xorg-proto/compositeproto_0.4.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/compositeproto_0.4.2.bb
rename to poky/meta/recipes-graphics/xorg-proto/compositeproto_0.4.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/damageproto_1.2.1.bb b/poky/meta/recipes-graphics/xorg-proto/damageproto_1.2.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/damageproto_1.2.1.bb
rename to poky/meta/recipes-graphics/xorg-proto/damageproto_1.2.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/dmxproto_2.3.1.bb b/poky/meta/recipes-graphics/xorg-proto/dmxproto_2.3.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/dmxproto_2.3.1.bb
rename to poky/meta/recipes-graphics/xorg-proto/dmxproto_2.3.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/dri2proto_2.8.bb b/poky/meta/recipes-graphics/xorg-proto/dri2proto_2.8.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/dri2proto_2.8.bb
rename to poky/meta/recipes-graphics/xorg-proto/dri2proto_2.8.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/dri3proto_1.0.bb b/poky/meta/recipes-graphics/xorg-proto/dri3proto_1.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/dri3proto_1.0.bb
rename to poky/meta/recipes-graphics/xorg-proto/dri3proto_1.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/fixesproto_5.0.bb b/poky/meta/recipes-graphics/xorg-proto/fixesproto_5.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/fixesproto_5.0.bb
rename to poky/meta/recipes-graphics/xorg-proto/fixesproto_5.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/fontsproto_2.1.3.bb b/poky/meta/recipes-graphics/xorg-proto/fontsproto_2.1.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/fontsproto_2.1.3.bb
rename to poky/meta/recipes-graphics/xorg-proto/fontsproto_2.1.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/glproto_1.4.17.bb b/poky/meta/recipes-graphics/xorg-proto/glproto_1.4.17.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/glproto_1.4.17.bb
rename to poky/meta/recipes-graphics/xorg-proto/glproto_1.4.17.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/inputproto_2.3.2.bb b/poky/meta/recipes-graphics/xorg-proto/inputproto_2.3.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/inputproto_2.3.2.bb
rename to poky/meta/recipes-graphics/xorg-proto/inputproto_2.3.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/kbproto_1.0.7.bb b/poky/meta/recipes-graphics/xorg-proto/kbproto_1.0.7.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/kbproto_1.0.7.bb
rename to poky/meta/recipes-graphics/xorg-proto/kbproto_1.0.7.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/presentproto_git.bb b/poky/meta/recipes-graphics/xorg-proto/presentproto_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/presentproto_git.bb
rename to poky/meta/recipes-graphics/xorg-proto/presentproto_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/randrproto_1.5.0.bb b/poky/meta/recipes-graphics/xorg-proto/randrproto_1.5.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/randrproto_1.5.0.bb
rename to poky/meta/recipes-graphics/xorg-proto/randrproto_1.5.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/recordproto_1.14.2.bb b/poky/meta/recipes-graphics/xorg-proto/recordproto_1.14.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/recordproto_1.14.2.bb
rename to poky/meta/recipes-graphics/xorg-proto/recordproto_1.14.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb b/poky/meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb
rename to poky/meta/recipes-graphics/xorg-proto/renderproto_0.11.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb b/poky/meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb
rename to poky/meta/recipes-graphics/xorg-proto/resourceproto_1.2.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/scrnsaverproto_1.2.2.bb b/poky/meta/recipes-graphics/xorg-proto/scrnsaverproto_1.2.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/scrnsaverproto_1.2.2.bb
rename to poky/meta/recipes-graphics/xorg-proto/scrnsaverproto_1.2.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/videoproto_2.3.3.bb b/poky/meta/recipes-graphics/xorg-proto/videoproto_2.3.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/videoproto_2.3.3.bb
rename to poky/meta/recipes-graphics/xorg-proto/videoproto_2.3.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto/0001-Make-whitespace-use-consistent.patch b/poky/meta/recipes-graphics/xorg-proto/xcb-proto/0001-Make-whitespace-use-consistent.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto/0001-Make-whitespace-use-consistent.patch
rename to poky/meta/recipes-graphics/xorg-proto/xcb-proto/0001-Make-whitespace-use-consistent.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto/0002-print-is-a-function-and-needs-parentheses.patch b/poky/meta/recipes-graphics/xorg-proto/xcb-proto/0002-print-is-a-function-and-needs-parentheses.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto/0002-print-is-a-function-and-needs-parentheses.patch
rename to poky/meta/recipes-graphics/xorg-proto/xcb-proto/0002-print-is-a-function-and-needs-parentheses.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto_1.12.bb b/poky/meta/recipes-graphics/xorg-proto/xcb-proto_1.12.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto_1.12.bb
rename to poky/meta/recipes-graphics/xorg-proto/xcb-proto_1.12.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xcmiscproto_1.2.2.bb b/poky/meta/recipes-graphics/xorg-proto/xcmiscproto_1.2.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xcmiscproto_1.2.2.bb
rename to poky/meta/recipes-graphics/xorg-proto/xcmiscproto_1.2.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xextproto_7.3.0.bb b/poky/meta/recipes-graphics/xorg-proto/xextproto_7.3.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xextproto_7.3.0.bb
rename to poky/meta/recipes-graphics/xorg-proto/xextproto_7.3.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xf86dgaproto_2.1.bb b/poky/meta/recipes-graphics/xorg-proto/xf86dgaproto_2.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xf86dgaproto_2.1.bb
rename to poky/meta/recipes-graphics/xorg-proto/xf86dgaproto_2.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xf86driproto_2.1.1.bb b/poky/meta/recipes-graphics/xorg-proto/xf86driproto_2.1.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xf86driproto_2.1.1.bb
rename to poky/meta/recipes-graphics/xorg-proto/xf86driproto_2.1.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xf86miscproto_0.9.3.bb b/poky/meta/recipes-graphics/xorg-proto/xf86miscproto_0.9.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xf86miscproto_0.9.3.bb
rename to poky/meta/recipes-graphics/xorg-proto/xf86miscproto_0.9.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xf86vidmodeproto_2.3.1.bb b/poky/meta/recipes-graphics/xorg-proto/xf86vidmodeproto_2.3.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xf86vidmodeproto_2.3.1.bb
rename to poky/meta/recipes-graphics/xorg-proto/xf86vidmodeproto_2.3.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xineramaproto_1.2.1.bb b/poky/meta/recipes-graphics/xorg-proto/xineramaproto_1.2.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xineramaproto_1.2.1.bb
rename to poky/meta/recipes-graphics/xorg-proto/xineramaproto_1.2.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc b/poky/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc
rename to poky/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch b/poky/meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch
rename to poky/meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xproto_7.0.31.bb b/poky/meta/recipes-graphics/xorg-proto/xproto_7.0.31.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xproto_7.0.31.bb
rename to poky/meta/recipes-graphics/xorg-proto/xproto_7.0.31.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-util/gccmakedep_1.0.3.bb b/poky/meta/recipes-graphics/xorg-util/gccmakedep_1.0.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-util/gccmakedep_1.0.3.bb
rename to poky/meta/recipes-graphics/xorg-util/gccmakedep_1.0.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-util/makedepend_1.0.5.bb b/poky/meta/recipes-graphics/xorg-util/makedepend_1.0.5.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-util/makedepend_1.0.5.bb
rename to poky/meta/recipes-graphics/xorg-util/makedepend_1.0.5.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-util/util-macros_1.19.1.bb b/poky/meta/recipes-graphics/xorg-util/util-macros_1.19.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-util/util-macros_1.19.1.bb
rename to poky/meta/recipes-graphics/xorg-util/util-macros_1.19.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-util/xorg-util-common.inc b/poky/meta/recipes-graphics/xorg-util/xorg-util-common.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-util/xorg-util-common.inc
rename to poky/meta/recipes-graphics/xorg-util/xorg-util-common.inc
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf b/poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf
rename to poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf b/poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf
rename to poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf b/poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf
rename to poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf b/poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf
rename to poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf b/poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf
rename to poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf b/poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf
rename to poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf b/poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf
rename to poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/xorg.conf b/poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/xorg.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/xorg.conf
rename to poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/xorg.conf
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb b/poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb
rename to poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
rename to poky/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch b/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch
rename to poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch b/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch
rename to poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/0003-Remove-check-for-useSIGIO-option.patch b/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/0003-Remove-check-for-useSIGIO-option.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/0003-Remove-check-for-useSIGIO-option.patch
rename to poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/0003-Remove-check-for-useSIGIO-option.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/0003-modesetting-Fix-16-bit-depth-bpp-mode.patch b/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/0003-modesetting-Fix-16-bit-depth-bpp-mode.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/0003-modesetting-Fix-16-bit-depth-bpp-mode.patch
rename to poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/0003-modesetting-Fix-16-bit-depth-bpp-mode.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch b/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
rename to poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/musl-arm-inb-outb.patch b/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/musl-arm-inb-outb.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/musl-arm-inb-outb.patch
rename to poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/musl-arm-inb-outb.patch
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.6.bb b/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.6.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.6.bb
rename to poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.6.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xrestop/xrestop_0.4.bb b/poky/meta/recipes-graphics/xrestop/xrestop_0.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xrestop/xrestop_0.4.bb
rename to poky/meta/recipes-graphics/xrestop/xrestop_0.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb b/poky/meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb
rename to poky/meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/blktrace/blktrace/ldflags.patch b/poky/meta/recipes-kernel/blktrace/blktrace/ldflags.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/blktrace/blktrace/ldflags.patch
rename to poky/meta/recipes-kernel/blktrace/blktrace/ldflags.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/blktrace/blktrace_git.bb b/poky/meta/recipes-kernel/blktrace/blktrace_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/blktrace/blktrace_git.bb
rename to poky/meta/recipes-kernel/blktrace/blktrace_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/cryptodev/cryptodev-linux_1.9.bb b/poky/meta/recipes-kernel/cryptodev/cryptodev-linux_1.9.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/cryptodev/cryptodev-linux_1.9.bb
rename to poky/meta/recipes-kernel/cryptodev/cryptodev-linux_1.9.bb
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/cryptodev/cryptodev-module_1.9.bb b/poky/meta/recipes-kernel/cryptodev/cryptodev-module_1.9.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/cryptodev/cryptodev-module_1.9.bb
rename to poky/meta/recipes-kernel/cryptodev/cryptodev-module_1.9.bb
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/cryptodev/cryptodev-tests_1.9.bb b/poky/meta/recipes-kernel/cryptodev/cryptodev-tests_1.9.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/cryptodev/cryptodev-tests_1.9.bb
rename to poky/meta/recipes-kernel/cryptodev/cryptodev-tests_1.9.bb
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/cryptodev/cryptodev.inc b/poky/meta/recipes-kernel/cryptodev/cryptodev.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/cryptodev/cryptodev.inc
rename to poky/meta/recipes-kernel/cryptodev/cryptodev.inc
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch b/poky/meta/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch
rename to poky/meta/recipes-kernel/cryptodev/files/0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch b/poky/meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch
rename to poky/meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/cryptodev/files/0001-ioctl.c-Fix-build-with-linux-4.13.patch b/poky/meta/recipes-kernel/cryptodev/files/0001-ioctl.c-Fix-build-with-linux-4.13.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/cryptodev/files/0001-ioctl.c-Fix-build-with-linux-4.13.patch
rename to poky/meta/recipes-kernel/cryptodev/files/0001-ioctl.c-Fix-build-with-linux-4.13.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/dtc/dtc.inc b/poky/meta/recipes-kernel/dtc/dtc.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/dtc/dtc.inc
rename to poky/meta/recipes-kernel/dtc/dtc.inc
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/dtc/dtc/0001-checks-Use-proper-format-modifier-for-size_t.patch b/poky/meta/recipes-kernel/dtc/dtc/0001-checks-Use-proper-format-modifier-for-size_t.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/dtc/dtc/0001-checks-Use-proper-format-modifier-for-size_t.patch
rename to poky/meta/recipes-kernel/dtc/dtc/0001-checks-Use-proper-format-modifier-for-size_t.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/dtc/dtc/make_install.patch b/poky/meta/recipes-kernel/dtc/dtc/make_install.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/dtc/dtc/make_install.patch
rename to poky/meta/recipes-kernel/dtc/dtc/make_install.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/dtc/dtc_1.4.5.bb b/poky/meta/recipes-kernel/dtc/dtc_1.4.5.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/dtc/dtc_1.4.5.bb
rename to poky/meta/recipes-kernel/dtc/dtc_1.4.5.bb
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/poky/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
rename to poky/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/kexec/kexec-tools/0001-Disable-PIE-during-link.patch b/poky/meta/recipes-kernel/kexec/kexec-tools/0001-Disable-PIE-during-link.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/kexec/kexec-tools/0001-Disable-PIE-during-link.patch
rename to poky/meta/recipes-kernel/kexec/kexec-tools/0001-Disable-PIE-during-link.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/kexec/kexec-tools/0001-purgatory-Pass-r-directly-to-linker.patch b/poky/meta/recipes-kernel/kexec/kexec-tools/0001-purgatory-Pass-r-directly-to-linker.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/kexec/kexec-tools/0001-purgatory-Pass-r-directly-to-linker.patch
rename to poky/meta/recipes-kernel/kexec/kexec-tools/0001-purgatory-Pass-r-directly-to-linker.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/kexec/kexec-tools/0002-powerpc-change-the-memory-size-limit.patch b/poky/meta/recipes-kernel/kexec/kexec-tools/0002-powerpc-change-the-memory-size-limit.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/kexec/kexec-tools/0002-powerpc-change-the-memory-size-limit.patch
rename to poky/meta/recipes-kernel/kexec/kexec-tools/0002-powerpc-change-the-memory-size-limit.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/kexec/kexec-tools/0010-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch b/poky/meta/recipes-kernel/kexec/kexec-tools/0010-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/kexec/kexec-tools/0010-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch
rename to poky/meta/recipes-kernel/kexec/kexec-tools/0010-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/kexec/kexec-tools/kdump b/poky/meta/recipes-kernel/kexec/kexec-tools/kdump
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/kexec/kexec-tools/kdump
rename to poky/meta/recipes-kernel/kexec/kexec-tools/kdump
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/kexec/kexec-tools/kdump.conf b/poky/meta/recipes-kernel/kexec/kexec-tools/kdump.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/kexec/kexec-tools/kdump.conf
rename to poky/meta/recipes-kernel/kexec/kexec-tools/kdump.conf
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/kexec/kexec-tools/kdump.service b/poky/meta/recipes-kernel/kexec/kexec-tools/kdump.service
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/kexec/kexec-tools/kdump.service
rename to poky/meta/recipes-kernel/kexec/kexec-tools/kdump.service
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/kexec/kexec-tools/kexec-x32.patch b/poky/meta/recipes-kernel/kexec/kexec-tools/kexec-x32.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/kexec/kexec-tools/kexec-x32.patch
rename to poky/meta/recipes-kernel/kexec/kexec-tools/kexec-x32.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/kexec/kexec-tools_2.0.16.bb b/poky/meta/recipes-kernel/kexec/kexec-tools_2.0.16.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/kexec/kexec-tools_2.0.16.bb
rename to poky/meta/recipes-kernel/kexec/kexec-tools_2.0.16.bb
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb b/poky/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb
rename to poky/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/kmod/kmod-native_git.bb b/poky/meta/recipes-kernel/kmod/kmod-native_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/kmod/kmod-native_git.bb
rename to poky/meta/recipes-kernel/kmod/kmod-native_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/kmod/kmod.inc b/poky/meta/recipes-kernel/kmod/kmod.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/kmod/kmod.inc
rename to poky/meta/recipes-kernel/kmod/kmod.inc
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch b/poky/meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch
rename to poky/meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch b/poky/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch
rename to poky/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/kmod/kmod/depmod-search.conf b/poky/meta/recipes-kernel/kmod/kmod/depmod-search.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/kmod/kmod/depmod-search.conf
rename to poky/meta/recipes-kernel/kmod/kmod/depmod-search.conf
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch b/poky/meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch
rename to poky/meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/kmod/kmod/ptest.patch b/poky/meta/recipes-kernel/kmod/kmod/ptest.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/kmod/kmod/ptest.patch
rename to poky/meta/recipes-kernel/kmod/kmod/ptest.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/kmod/kmod/run-ptest b/poky/meta/recipes-kernel/kmod/kmod/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/kmod/kmod/run-ptest
rename to poky/meta/recipes-kernel/kmod/kmod/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/kmod/kmod_git.bb b/poky/meta/recipes-kernel/kmod/kmod_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/kmod/kmod_git.bb
rename to poky/meta/recipes-kernel/kmod/kmod_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/poky/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
rename to poky/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc b/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
rename to poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch b/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch
rename to poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch b/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch
rename to poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch b/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch
rename to poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch b/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch
rename to poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch b/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
rename to poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.15.7.bb b/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.15.7.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.15.7.bb
rename to poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.15.7.bb
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux/kernel-devsrc.bb b/poky/meta/recipes-kernel/linux/kernel-devsrc.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/linux/kernel-devsrc.bb
rename to poky/meta/recipes-kernel/linux/kernel-devsrc.bb
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-dtb.inc b/poky/meta/recipes-kernel/linux/linux-dtb.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/linux/linux-dtb.inc
rename to poky/meta/recipes-kernel/linux/linux-dtb.inc
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-dummy.bb b/poky/meta/recipes-kernel/linux/linux-dummy.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/linux/linux-dummy.bb
rename to poky/meta/recipes-kernel/linux/linux-dummy.bb
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-dummy/COPYING.GPL b/poky/meta/recipes-kernel/linux/linux-dummy/COPYING.GPL
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/linux/linux-dummy/COPYING.GPL
rename to poky/meta/recipes-kernel/linux/linux-dummy/COPYING.GPL
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto-dev.bb b/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto-dev.bb
rename to poky/meta/recipes-kernel/linux/linux-yocto-dev.bb
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb b/poky/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb
rename to poky/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb b/poky/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb
rename to poky/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto-rt_4.15.bb b/poky/meta/recipes-kernel/linux/linux-yocto-rt_4.15.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto-rt_4.15.bb
rename to poky/meta/recipes-kernel/linux/linux-yocto-rt_4.15.bb
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb
rename to poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb
rename to poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb
rename to poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto.inc b/poky/meta/recipes-kernel/linux/linux-yocto.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto.inc
rename to poky/meta/recipes-kernel/linux/linux-yocto.inc
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto_4.12.bb b/poky/meta/recipes-kernel/linux/linux-yocto_4.12.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto_4.12.bb
rename to poky/meta/recipes-kernel/linux/linux-yocto_4.12.bb
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto_4.14.bb b/poky/meta/recipes-kernel/linux/linux-yocto_4.14.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto_4.14.bb
rename to poky/meta/recipes-kernel/linux/linux-yocto_4.14.bb
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto_4.15.bb b/poky/meta/recipes-kernel/linux/linux-yocto_4.15.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto_4.15.bb
rename to poky/meta/recipes-kernel/linux/linux-yocto_4.15.bb
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/lttng/babeltrace_1.5.4.bb b/poky/meta/recipes-kernel/lttng/babeltrace_1.5.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/lttng/babeltrace_1.5.4.bb
rename to poky/meta/recipes-kernel/lttng/babeltrace_1.5.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-modules/BUILD_RUNTIME_BUG_ON-vs-gcc7.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/BUILD_RUNTIME_BUG_ON-vs-gcc7.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-modules/BUILD_RUNTIME_BUG_ON-vs-gcc7.patch
rename to poky/meta/recipes-kernel/lttng/lttng-modules/BUILD_RUNTIME_BUG_ON-vs-gcc7.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-modules/Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch b/poky/meta/recipes-kernel/lttng/lttng-modules/Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-modules/Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch
rename to poky/meta/recipes-kernel/lttng/lttng-modules/Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-modules_2.10.5.bb b/poky/meta/recipes-kernel/lttng/lttng-modules_2.10.5.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-modules_2.10.5.bb
rename to poky/meta/recipes-kernel/lttng/lttng-modules_2.10.5.bb
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/run-ptest b/poky/meta/recipes-kernel/lttng/lttng-tools/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/run-ptest
rename to poky/meta/recipes-kernel/lttng/lttng-tools/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/x32.patch b/poky/meta/recipes-kernel/lttng/lttng-tools/x32.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/x32.patch
rename to poky/meta/recipes-kernel/lttng/lttng-tools/x32.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools_2.9.5.bb b/poky/meta/recipes-kernel/lttng/lttng-tools_2.9.5.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools_2.9.5.bb
rename to poky/meta/recipes-kernel/lttng/lttng-tools_2.9.5.bb
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch b/poky/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch
rename to poky/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-ust_2.10.1.bb b/poky/meta/recipes-kernel/lttng/lttng-ust_2.10.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-ust_2.10.1.bb
rename to poky/meta/recipes-kernel/lttng/lttng-ust_2.10.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb b/poky/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb
rename to poky/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/modutils-initscripts/files/PD.patch b/poky/meta/recipes-kernel/modutils-initscripts/files/PD.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/modutils-initscripts/files/PD.patch
rename to poky/meta/recipes-kernel/modutils-initscripts/files/PD.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/modutils-initscripts/files/modutils.sh b/poky/meta/recipes-kernel/modutils-initscripts/files/modutils.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/modutils-initscripts/files/modutils.sh
rename to poky/meta/recipes-kernel/modutils-initscripts/files/modutils.sh
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb b/poky/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb
rename to poky/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/perf/perf.bb b/poky/meta/recipes-kernel/perf/perf.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/perf/perf.bb
rename to poky/meta/recipes-kernel/perf/perf.bb
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/powertop/powertop_2.9.bb b/poky/meta/recipes-kernel/powertop/powertop_2.9.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/powertop/powertop_2.9.bb
rename to poky/meta/recipes-kernel/powertop/powertop_2.9.bb
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch b/poky/meta/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch
rename to poky/meta/recipes-kernel/sysprof/files/0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch b/poky/meta/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch
rename to poky/meta/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/sysprof/sysprof_3.26.1.bb b/poky/meta/recipes-kernel/sysprof/sysprof_3.26.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/sysprof/sysprof_3.26.1.bb
rename to poky/meta/recipes-kernel/sysprof/sysprof_3.26.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap-native_git.bb b/poky/meta/recipes-kernel/systemtap/systemtap-native_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap-native_git.bb
rename to poky/meta/recipes-kernel/systemtap/systemtap-native_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb b/poky/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb
rename to poky/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/0001-Added-a-couple-of-small-sysroot-fixes.patch b/poky/meta/recipes-kernel/systemtap/systemtap/0001-Added-a-couple-of-small-sysroot-fixes.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/0001-Added-a-couple-of-small-sysroot-fixes.patch
rename to poky/meta/recipes-kernel/systemtap/systemtap/0001-Added-a-couple-of-small-sysroot-fixes.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/0001-Delay-adding-sysroot-path-to-module-name-in-case-of-.patch b/poky/meta/recipes-kernel/systemtap/systemtap/0001-Delay-adding-sysroot-path-to-module-name-in-case-of-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/0001-Delay-adding-sysroot-path-to-module-name-in-case-of-.patch
rename to poky/meta/recipes-kernel/systemtap/systemtap/0001-Delay-adding-sysroot-path-to-module-name-in-case-of-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/0001-Do-not-let-configure-write-a-python-location-into-th.patch b/poky/meta/recipes-kernel/systemtap/systemtap/0001-Do-not-let-configure-write-a-python-location-into-th.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/0001-Do-not-let-configure-write-a-python-location-into-th.patch
rename to poky/meta/recipes-kernel/systemtap/systemtap/0001-Do-not-let-configure-write-a-python-location-into-th.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/0001-Fix-PR22551-by-updating-the-use-of-timers-for-the-4..patch b/poky/meta/recipes-kernel/systemtap/systemtap/0001-Fix-PR22551-by-updating-the-use-of-timers-for-the-4..patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/0001-Fix-PR22551-by-updating-the-use-of-timers-for-the-4..patch
rename to poky/meta/recipes-kernel/systemtap/systemtap/0001-Fix-PR22551-by-updating-the-use-of-timers-for-the-4..patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/0001-Fixes-for-gcc-8.patch b/poky/meta/recipes-kernel/systemtap/systemtap/0001-Fixes-for-gcc-8.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/0001-Fixes-for-gcc-8.patch
rename to poky/meta/recipes-kernel/systemtap/systemtap/0001-Fixes-for-gcc-8.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/0001-Install-python-modules-to-correct-library-dir.patch b/poky/meta/recipes-kernel/systemtap/systemtap/0001-Install-python-modules-to-correct-library-dir.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/0001-Install-python-modules-to-correct-library-dir.patch
rename to poky/meta/recipes-kernel/systemtap/systemtap/0001-Install-python-modules-to-correct-library-dir.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/0001-Make-sure-sysroot-paths-don-t-end-with-a-slash.patch b/poky/meta/recipes-kernel/systemtap/systemtap/0001-Make-sure-sysroot-paths-don-t-end-with-a-slash.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/0001-Make-sure-sysroot-paths-don-t-end-with-a-slash.patch
rename to poky/meta/recipes-kernel/systemtap/systemtap/0001-Make-sure-sysroot-paths-don-t-end-with-a-slash.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/0001-Use-sysroot-when-looking-for-the-System.map-file.patch b/poky/meta/recipes-kernel/systemtap/systemtap/0001-Use-sysroot-when-looking-for-the-System.map-file.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/0001-Use-sysroot-when-looking-for-the-System.map-file.patch
rename to poky/meta/recipes-kernel/systemtap/systemtap/0001-Use-sysroot-when-looking-for-the-System.map-file.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/0001-_stp_umodule_relocate-needs-target-file-path-not-hos.patch b/poky/meta/recipes-kernel/systemtap/systemtap/0001-_stp_umodule_relocate-needs-target-file-path-not-hos.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/0001-_stp_umodule_relocate-needs-target-file-path-not-hos.patch
rename to poky/meta/recipes-kernel/systemtap/systemtap/0001-_stp_umodule_relocate-needs-target-file-path-not-hos.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/0001-buildrun-remove-quotes-around-I-include-line.patch b/poky/meta/recipes-kernel/systemtap/systemtap/0001-buildrun-remove-quotes-around-I-include-line.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/0001-buildrun-remove-quotes-around-I-include-line.patch
rename to poky/meta/recipes-kernel/systemtap/systemtap/0001-buildrun-remove-quotes-around-I-include-line.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/0001-debuginfo-lookup-with-sysroot-case-do-not-remove-sys.patch b/poky/meta/recipes-kernel/systemtap/systemtap/0001-debuginfo-lookup-with-sysroot-case-do-not-remove-sys.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/0001-debuginfo-lookup-with-sysroot-case-do-not-remove-sys.patch
rename to poky/meta/recipes-kernel/systemtap/systemtap/0001-debuginfo-lookup-with-sysroot-case-do-not-remove-sys.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch b/poky/meta/recipes-kernel/systemtap/systemtap/0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch
rename to poky/meta/recipes-kernel/systemtap/systemtap/0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/0001-sysroot-fix-short-release-r-option-handling-follow-u.patch b/poky/meta/recipes-kernel/systemtap/systemtap/0001-sysroot-fix-short-release-r-option-handling-follow-u.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/0001-sysroot-fix-short-release-r-option-handling-follow-u.patch
rename to poky/meta/recipes-kernel/systemtap/systemtap/0001-sysroot-fix-short-release-r-option-handling-follow-u.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/0001-sysroot-fix-short-release-r-option-handling.patch b/poky/meta/recipes-kernel/systemtap/systemtap/0001-sysroot-fix-short-release-r-option-handling.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/0001-sysroot-fix-short-release-r-option-handling.patch
rename to poky/meta/recipes-kernel/systemtap/systemtap/0001-sysroot-fix-short-release-r-option-handling.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/0001-sysroot-handle-symbolic-links-with-absolute-name-rel.patch b/poky/meta/recipes-kernel/systemtap/systemtap/0001-sysroot-handle-symbolic-links-with-absolute-name-rel.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/0001-sysroot-handle-symbolic-links-with-absolute-name-rel.patch
rename to poky/meta/recipes-kernel/systemtap/systemtap/0001-sysroot-handle-symbolic-links-with-absolute-name-rel.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/configure-allow-to-disable-libvirt.patch b/poky/meta/recipes-kernel/systemtap/systemtap/configure-allow-to-disable-libvirt.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/configure-allow-to-disable-libvirt.patch
rename to poky/meta/recipes-kernel/systemtap/systemtap/configure-allow-to-disable-libvirt.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/monitor-option.patch b/poky/meta/recipes-kernel/systemtap/systemtap/monitor-option.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/monitor-option.patch
rename to poky/meta/recipes-kernel/systemtap/systemtap/monitor-option.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/no-msgfmt-check.patch b/poky/meta/recipes-kernel/systemtap/systemtap/no-msgfmt-check.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/no-msgfmt-check.patch
rename to poky/meta/recipes-kernel/systemtap/systemtap/no-msgfmt-check.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/x32_abi_time.patch b/poky/meta/recipes-kernel/systemtap/systemtap/x32_abi_time.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/x32_abi_time.patch
rename to poky/meta/recipes-kernel/systemtap/systemtap/x32_abi_time.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap_git.bb b/poky/meta/recipes-kernel/systemtap/systemtap_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap_git.bb
rename to poky/meta/recipes-kernel/systemtap/systemtap_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap_git.inc b/poky/meta/recipes-kernel/systemtap/systemtap_git.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap_git.inc
rename to poky/meta/recipes-kernel/systemtap/systemtap_git.inc
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/trace-cmd/kernelshark_git.bb b/poky/meta/recipes-kernel/trace-cmd/kernelshark_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/trace-cmd/kernelshark_git.bb
rename to poky/meta/recipes-kernel/trace-cmd/kernelshark_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/trace-cmd/trace-cmd.inc b/poky/meta/recipes-kernel/trace-cmd/trace-cmd.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/trace-cmd/trace-cmd.inc
rename to poky/meta/recipes-kernel/trace-cmd/trace-cmd.inc
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/trace-cmd/trace-cmd/0001-Include-limits.h-so-that-PATH_MAX-is-defined-an-issu.patch b/poky/meta/recipes-kernel/trace-cmd/trace-cmd/0001-Include-limits.h-so-that-PATH_MAX-is-defined-an-issu.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/trace-cmd/trace-cmd/0001-Include-limits.h-so-that-PATH_MAX-is-defined-an-issu.patch
rename to poky/meta/recipes-kernel/trace-cmd/trace-cmd/0001-Include-limits.h-so-that-PATH_MAX-is-defined-an-issu.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/trace-cmd/trace-cmd/blktrace-api-compatibility.patch b/poky/meta/recipes-kernel/trace-cmd/trace-cmd/blktrace-api-compatibility.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/trace-cmd/trace-cmd/blktrace-api-compatibility.patch
rename to poky/meta/recipes-kernel/trace-cmd/trace-cmd/blktrace-api-compatibility.patch
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb b/poky/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb
rename to poky/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/alsa/alsa-fpu.inc b/poky/meta/recipes-multimedia/alsa/alsa-fpu.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/alsa/alsa-fpu.inc
rename to poky/meta/recipes-multimedia/alsa/alsa-fpu.inc
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/alsa/alsa-lib_1.1.5.bb b/poky/meta/recipes-multimedia/alsa/alsa-lib_1.1.5.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/alsa/alsa-lib_1.1.5.bb
rename to poky/meta/recipes-multimedia/alsa/alsa-lib_1.1.5.bb
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/alsa/alsa-plugins_1.1.5.bb b/poky/meta/recipes-multimedia/alsa/alsa-plugins_1.1.5.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/alsa/alsa-plugins_1.1.5.bb
rename to poky/meta/recipes-multimedia/alsa/alsa-plugins_1.1.5.bb
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch b/poky/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch
rename to poky/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/alsa/alsa-tools/gitcompile_hdajacksensetest b/poky/meta/recipes-multimedia/alsa/alsa-tools/gitcompile_hdajacksensetest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/alsa/alsa-tools/gitcompile_hdajacksensetest
rename to poky/meta/recipes-multimedia/alsa/alsa-tools/gitcompile_hdajacksensetest
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/alsa/alsa-tools/makefile_no_gtk.patch b/poky/meta/recipes-multimedia/alsa/alsa-tools/makefile_no_gtk.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/alsa/alsa-tools/makefile_no_gtk.patch
rename to poky/meta/recipes-multimedia/alsa/alsa-tools/makefile_no_gtk.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/alsa/alsa-tools_1.1.5.bb b/poky/meta/recipes-multimedia/alsa/alsa-tools_1.1.5.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/alsa/alsa-tools_1.1.5.bb
rename to poky/meta/recipes-multimedia/alsa/alsa-tools_1.1.5.bb
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.1.5.bb b/poky/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.1.5.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.1.5.bb
rename to poky/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.1.5.bb
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch b/poky/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch
rename to poky/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/alsa/alsa-utils_1.1.5.bb b/poky/meta/recipes-multimedia/alsa/alsa-utils_1.1.5.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/alsa/alsa-utils_1.1.5.bb
rename to poky/meta/recipes-multimedia/alsa/alsa-utils_1.1.5.bb
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/ffmpeg/ffmpeg/mips64_cpu_detection.patch b/poky/meta/recipes-multimedia/ffmpeg/ffmpeg/mips64_cpu_detection.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/ffmpeg/ffmpeg/mips64_cpu_detection.patch
rename to poky/meta/recipes-multimedia/ffmpeg/ffmpeg/mips64_cpu_detection.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/ffmpeg/ffmpeg_3.4.2.bb b/poky/meta/recipes-multimedia/ffmpeg/ffmpeg_3.4.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/ffmpeg/ffmpeg_3.4.2.bb
rename to poky/meta/recipes-multimedia/ffmpeg/ffmpeg_3.4.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/flac/flac_1.3.2.bb b/poky/meta/recipes-multimedia/flac/flac_1.3.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/flac/flac_1.3.2.bb
rename to poky/meta/recipes-multimedia/flac/flac_1.3.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/files/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch b/poky/meta/recipes-multimedia/gstreamer/files/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/files/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch
rename to poky/meta/recipes-multimedia/gstreamer/files/0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/files/0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch b/poky/meta/recipes-multimedia/gstreamer/files/0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/files/0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch
rename to poky/meta/recipes-multimedia/gstreamer/files/0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/files/gtk-doc-tweaks.patch b/poky/meta/recipes-multimedia/gstreamer/files/gtk-doc-tweaks.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/files/gtk-doc-tweaks.patch
rename to poky/meta/recipes-multimedia/gstreamer/files/gtk-doc-tweaks.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gst-examples/0001-Make-player-examples-installable.patch b/poky/meta/recipes-multimedia/gstreamer/gst-examples/0001-Make-player-examples-installable.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gst-examples/0001-Make-player-examples-installable.patch
rename to poky/meta/recipes-multimedia/gstreamer/gst-examples/0001-Make-player-examples-installable.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gst-examples/gst-player.desktop b/poky/meta/recipes-multimedia/gstreamer/gst-examples/gst-player.desktop
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gst-examples/gst-player.desktop
rename to poky/meta/recipes-multimedia/gstreamer/gst-examples/gst-player.desktop
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gst-examples_git.bb b/poky/meta/recipes-multimedia/gstreamer/gst-examples_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gst-examples_git.bb
rename to poky/meta/recipes-multimedia/gstreamer/gst-examples_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc b/poky/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc
rename to poky/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gst-validate_1.12.4.bb b/poky/meta/recipes-multimedia/gstreamer/gst-validate_1.12.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gst-validate_1.12.4.bb
rename to poky/meta/recipes-multimedia/gstreamer/gst-validate_1.12.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-Disable-yasm-for-libav-when-disable-yasm.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-Disable-yasm-for-libav-when-disable-yasm.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-Disable-yasm-for-libav-when-disable-yasm.patch
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-Disable-yasm-for-libav-when-disable-yasm.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-configure-check-for-armv7ve-variant.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-configure-check-for-armv7ve-variant.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-configure-check-for-armv7ve-variant.patch
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-configure-check-for-armv7ve-variant.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-hevcpred_msa.c-Fix-build-by-Including-libavcodec-hev.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-hevcpred_msa.c-Fix-build-by-Including-libavcodec-hev.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-hevcpred_msa.c-Fix-build-by-Including-libavcodec-hev.patch
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-hevcpred_msa.c-Fix-build-by-Including-libavcodec-hev.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/mips64_cpu_detection.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/mips64_cpu_detection.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/mips64_cpu_detection.patch
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/mips64_cpu_detection.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/workaround-to-build-gst-libav-for-i586-with-gcc.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/workaround-to-build-gst-libav-for-i586-with-gcc.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/workaround-to-build-gst-libav-for-i586-with-gcc.patch
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/workaround-to-build-gst-libav-for-i586-with-gcc.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.12.4.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.12.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.12.4.bb
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.12.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx.inc
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.12.4.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.12.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.12.4.bb
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.12.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-vkdisplay-Use-ifdef-for-platform-specific-defines.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-vkdisplay-Use-ifdef-for-platform-specific-defines.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-vkdisplay-Use-ifdef-for-platform-specific-defines.patch
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-vkdisplay-Use-ifdef-for-platform-specific-defines.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-vulkan-Use-the-generated-version-of-vkconfig.h.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-vulkan-Use-the-generated-version-of-vkconfig.h.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-vulkan-Use-the-generated-version-of-vkconfig.h.patch
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-vulkan-Use-the-generated-version-of-vkconfig.h.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0009-glimagesink-Downrank-to-marginal.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0009-glimagesink-Downrank-to-marginal.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0009-glimagesink-Downrank-to-marginal.patch
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0009-glimagesink-Downrank-to-marginal.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/avoid-including-sys-poll.h-directly.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/avoid-including-sys-poll.h-directly.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/avoid-including-sys-poll.h-directly.patch
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/avoid-including-sys-poll.h-directly.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/configure-allow-to-disable-libssh2.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/configure-allow-to-disable-libssh2.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/configure-allow-to-disable-libssh2.patch
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/configure-allow-to-disable-libssh2.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/ensure-valid-sentinels-for-gst_structure_get-etc.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/ensure-valid-sentinels-for-gst_structure_get-etc.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/ensure-valid-sentinels-for-gst_structure_get-etc.patch
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/ensure-valid-sentinels-for-gst_structure_get-etc.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/link-with-libvchostif.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/link-with-libvchostif.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/link-with-libvchostif.patch
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/link-with-libvchostif.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.12.4.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.12.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.12.4.bb
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.12.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-riff-add-missing-include-directories-when-calling-in.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-riff-add-missing-include-directories-when-calling-in.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-riff-add-missing-include-directories-when-calling-in.patch
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-riff-add-missing-include-directories-when-calling-in.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-subparse-set-need_segment-after-sink-pad-received-GS.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-subparse-set-need_segment-after-sink-pad-received-GS.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-subparse-set-need_segment-after-sink-pad-received-GS.patch
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-subparse-set-need_segment-after-sink-pad-received-GS.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.12.4.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.12.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.12.4.bb
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.12.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-gstrtpmp4gpay-set-dafault-value-for-MPEG4-without-co.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-gstrtpmp4gpay-set-dafault-value-for-MPEG4-without-co.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-gstrtpmp4gpay-set-dafault-value-for-MPEG4-without-co.patch
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-gstrtpmp4gpay-set-dafault-value-for-MPEG4-without-co.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/avoid-including-sys-poll.h-directly.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/avoid-including-sys-poll.h-directly.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/avoid-including-sys-poll.h-directly.patch
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/avoid-including-sys-poll.h-directly.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/ensure-valid-sentinel-for-gst_structure_get.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/ensure-valid-sentinel-for-gst_structure_get.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/ensure-valid-sentinel-for-gst_structure_get.patch
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/ensure-valid-sentinel-for-gst_structure_get.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.12.4.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.12.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.12.4.bb
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.12.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.12.4.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.12.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.12.4.bb
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.12.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-python.inc b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-python.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-python.inc
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-python.inc
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.12.4.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.12.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.12.4.bb
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.12.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server/0001-Don-t-hardcode-libtool-name-when-using-introspection.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server/0001-Don-t-hardcode-libtool-name-when-using-introspection.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server/0001-Don-t-hardcode-libtool-name-when-using-introspection.patch
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server/0001-Don-t-hardcode-libtool-name-when-using-introspection.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.12.4.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.12.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.12.4.bb
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.12.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi.inc b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi.inc
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi.inc
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.12.4.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.12.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.12.4.bb
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.12.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.4.bb b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.4.bb
rename to poky/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/lame/lame/no-gtk1.patch b/poky/meta/recipes-multimedia/lame/lame/no-gtk1.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/lame/lame/no-gtk1.patch
rename to poky/meta/recipes-multimedia/lame/lame/no-gtk1.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/lame/lame_3.100.bb b/poky/meta/recipes-multimedia/lame/lame_3.100.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/lame/lame_3.100.bb
rename to poky/meta/recipes-multimedia/lame/lame_3.100.bb
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/liba52/liba52/buildcleanup.patch b/poky/meta/recipes-multimedia/liba52/liba52/buildcleanup.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/liba52/liba52/buildcleanup.patch
rename to poky/meta/recipes-multimedia/liba52/liba52/buildcleanup.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/liba52/liba52_0.7.4.bb b/poky/meta/recipes-multimedia/liba52/liba52_0.7.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/liba52/liba52_0.7.4.bb
rename to poky/meta/recipes-multimedia/liba52/liba52_0.7.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/libid3tag/libid3tag/0001-Fix-gperf-3.1-incompatibility.patch b/poky/meta/recipes-multimedia/libid3tag/libid3tag/0001-Fix-gperf-3.1-incompatibility.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/libid3tag/libid3tag/0001-Fix-gperf-3.1-incompatibility.patch
rename to poky/meta/recipes-multimedia/libid3tag/libid3tag/0001-Fix-gperf-3.1-incompatibility.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/libid3tag/libid3tag/addpkgconfig.patch b/poky/meta/recipes-multimedia/libid3tag/libid3tag/addpkgconfig.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/libid3tag/libid3tag/addpkgconfig.patch
rename to poky/meta/recipes-multimedia/libid3tag/libid3tag/addpkgconfig.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/libid3tag/libid3tag/obsolete_automake_macros.patch b/poky/meta/recipes-multimedia/libid3tag/libid3tag/obsolete_automake_macros.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/libid3tag/libid3tag/obsolete_automake_macros.patch
rename to poky/meta/recipes-multimedia/libid3tag/libid3tag/obsolete_automake_macros.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb b/poky/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb
rename to poky/meta/recipes-multimedia/libid3tag/libid3tag_0.15.1b.bb
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/libogg/libogg_1.3.3.bb b/poky/meta/recipes-multimedia/libogg/libogg_1.3.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/libogg/libogg_1.3.3.bb
rename to poky/meta/recipes-multimedia/libogg/libogg_1.3.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/libomxil/libomxil-0.9.3/configure-fix.patch b/poky/meta/recipes-multimedia/libomxil/libomxil-0.9.3/configure-fix.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/libomxil/libomxil-0.9.3/configure-fix.patch
rename to poky/meta/recipes-multimedia/libomxil/libomxil-0.9.3/configure-fix.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/libomxil/libomxil-0.9.3/disable-so-versioning.patch b/poky/meta/recipes-multimedia/libomxil/libomxil-0.9.3/disable-so-versioning.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/libomxil/libomxil-0.9.3/disable-so-versioning.patch
rename to poky/meta/recipes-multimedia/libomxil/libomxil-0.9.3/disable-so-versioning.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/libomxil/libomxil-0.9.3/dynamicloader-linking.patch b/poky/meta/recipes-multimedia/libomxil/libomxil-0.9.3/dynamicloader-linking.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/libomxil/libomxil-0.9.3/dynamicloader-linking.patch
rename to poky/meta/recipes-multimedia/libomxil/libomxil-0.9.3/dynamicloader-linking.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/libomxil/libomxil-0.9.3/makefile-docdir-fix.patch b/poky/meta/recipes-multimedia/libomxil/libomxil-0.9.3/makefile-docdir-fix.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/libomxil/libomxil-0.9.3/makefile-docdir-fix.patch
rename to poky/meta/recipes-multimedia/libomxil/libomxil-0.9.3/makefile-docdir-fix.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/libomxil/libomxil-0.9.3/parallel-make.patch b/poky/meta/recipes-multimedia/libomxil/libomxil-0.9.3/parallel-make.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/libomxil/libomxil-0.9.3/parallel-make.patch
rename to poky/meta/recipes-multimedia/libomxil/libomxil-0.9.3/parallel-make.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb b/poky/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb
rename to poky/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/libpng/libpng_1.6.34.bb b/poky/meta/recipes-multimedia/libpng/libpng_1.6.34.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/libpng/libpng_1.6.34.bb
rename to poky/meta/recipes-multimedia/libpng/libpng_1.6.34.bb
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/libsamplerate/libsamplerate0/0001-configure.ac-improve-alsa-handling.patch b/poky/meta/recipes-multimedia/libsamplerate/libsamplerate0/0001-configure.ac-improve-alsa-handling.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/libsamplerate/libsamplerate0/0001-configure.ac-improve-alsa-handling.patch
rename to poky/meta/recipes-multimedia/libsamplerate/libsamplerate0/0001-configure.ac-improve-alsa-handling.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.9.bb b/poky/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.9.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.9.bb
rename to poky/meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.9.bb
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-6892.patch b/poky/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-6892.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-6892.patch
rename to poky/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-6892.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-8361-8365.patch b/poky/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-8361-8365.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-8361-8365.patch
rename to poky/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-8361-8365.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-8362.patch b/poky/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-8362.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-8362.patch
rename to poky/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-8362.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-8363.patch b/poky/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-8363.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-8363.patch
rename to poky/meta/recipes-multimedia/libsndfile/libsndfile1/CVE-2017-8363.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb b/poky/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb
rename to poky/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.28.bb
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/libtheora/libtheora-1.1.1/no-docs.patch b/poky/meta/recipes-multimedia/libtheora/libtheora-1.1.1/no-docs.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/libtheora/libtheora-1.1.1/no-docs.patch
rename to poky/meta/recipes-multimedia/libtheora/libtheora-1.1.1/no-docs.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/libtheora/libtheora_1.1.1.bb b/poky/meta/recipes-multimedia/libtheora/libtheora_1.1.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/libtheora/libtheora_1.1.1.bb
rename to poky/meta/recipes-multimedia/libtheora/libtheora_1.1.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/libtiff/files/CVE-2017-18013.patch b/poky/meta/recipes-multimedia/libtiff/files/CVE-2017-18013.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/libtiff/files/CVE-2017-18013.patch
rename to poky/meta/recipes-multimedia/libtiff/files/CVE-2017-18013.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/libtiff/files/CVE-2017-9935.patch b/poky/meta/recipes-multimedia/libtiff/files/CVE-2017-9935.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/libtiff/files/CVE-2017-9935.patch
rename to poky/meta/recipes-multimedia/libtiff/files/CVE-2017-9935.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/libtiff/files/CVE-2018-5784.patch b/poky/meta/recipes-multimedia/libtiff/files/CVE-2018-5784.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/libtiff/files/CVE-2018-5784.patch
rename to poky/meta/recipes-multimedia/libtiff/files/CVE-2018-5784.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/libtiff/files/libtool2.patch b/poky/meta/recipes-multimedia/libtiff/files/libtool2.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/libtiff/files/libtool2.patch
rename to poky/meta/recipes-multimedia/libtiff/files/libtool2.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/libtiff/tiff_4.0.9.bb b/poky/meta/recipes-multimedia/libtiff/tiff_4.0.9.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/libtiff/tiff_4.0.9.bb
rename to poky/meta/recipes-multimedia/libtiff/tiff_4.0.9.bb
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/libvorbis/libvorbis/0001-configure-Check-for-clang.patch b/poky/meta/recipes-multimedia/libvorbis/libvorbis/0001-configure-Check-for-clang.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/libvorbis/libvorbis/0001-configure-Check-for-clang.patch
rename to poky/meta/recipes-multimedia/libvorbis/libvorbis/0001-configure-Check-for-clang.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/libvorbis/libvorbis/CVE-2017-14632.patch b/poky/meta/recipes-multimedia/libvorbis/libvorbis/CVE-2017-14632.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/libvorbis/libvorbis/CVE-2017-14632.patch
rename to poky/meta/recipes-multimedia/libvorbis/libvorbis/CVE-2017-14632.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/libvorbis/libvorbis/CVE-2017-14633.patch b/poky/meta/recipes-multimedia/libvorbis/libvorbis/CVE-2017-14633.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/libvorbis/libvorbis/CVE-2017-14633.patch
rename to poky/meta/recipes-multimedia/libvorbis/libvorbis/CVE-2017-14633.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/libvorbis/libvorbis/CVE-2018-5146.patch b/poky/meta/recipes-multimedia/libvorbis/libvorbis/CVE-2018-5146.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/libvorbis/libvorbis/CVE-2018-5146.patch
rename to poky/meta/recipes-multimedia/libvorbis/libvorbis/CVE-2018-5146.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/libvorbis/libvorbis_1.3.5.bb b/poky/meta/recipes-multimedia/libvorbis/libvorbis_1.3.5.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/libvorbis/libvorbis_1.3.5.bb
rename to poky/meta/recipes-multimedia/libvorbis/libvorbis_1.3.5.bb
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/mpeg2dec/files/0001-check-for-available-arm-optimizations.patch b/poky/meta/recipes-multimedia/mpeg2dec/files/0001-check-for-available-arm-optimizations.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/mpeg2dec/files/0001-check-for-available-arm-optimizations.patch
rename to poky/meta/recipes-multimedia/mpeg2dec/files/0001-check-for-available-arm-optimizations.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/mpeg2dec/files/0002-Set-visibility-of-global-symbols-used-in-ARM-specifi.patch b/poky/meta/recipes-multimedia/mpeg2dec/files/0002-Set-visibility-of-global-symbols-used-in-ARM-specifi.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/mpeg2dec/files/0002-Set-visibility-of-global-symbols-used-in-ARM-specifi.patch
rename to poky/meta/recipes-multimedia/mpeg2dec/files/0002-Set-visibility-of-global-symbols-used-in-ARM-specifi.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/mpeg2dec/files/altivec_h_needed.patch b/poky/meta/recipes-multimedia/mpeg2dec/files/altivec_h_needed.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/mpeg2dec/files/altivec_h_needed.patch
rename to poky/meta/recipes-multimedia/mpeg2dec/files/altivec_h_needed.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.5.1.bb b/poky/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.5.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.5.1.bb
rename to poky/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.5.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/mpg123/mpg123_1.25.10.bb b/poky/meta/recipes-multimedia/mpg123/mpg123_1.25.10.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/mpg123/mpg123_1.25.10.bb
rename to poky/meta/recipes-multimedia/mpg123/mpg123_1.25.10.bb
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
rename to poky/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-client-conf-Add-allow-autospawn-for-root.patch b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-client-conf-Add-allow-autospawn-for-root.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-client-conf-Add-allow-autospawn-for-root.patch
rename to poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-client-conf-Add-allow-autospawn-for-root.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-memfd-wrappers-only-define-memfd_create-if-not-alrea.patch b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-memfd-wrappers-only-define-memfd_create-if-not-alrea.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-memfd-wrappers-only-define-memfd_create-if-not-alrea.patch
rename to poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-memfd-wrappers-only-define-memfd_create-if-not-alrea.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-padsp-Make-it-compile-on-musl.patch b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-padsp-Make-it-compile-on-musl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-padsp-Make-it-compile-on-musl.patch
rename to poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-padsp-Make-it-compile-on-musl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio/volatiles.04_pulse b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio/volatiles.04_pulse
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio/volatiles.04_pulse
rename to poky/meta/recipes-multimedia/pulseaudio/pulseaudio/volatiles.04_pulse
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio_11.1.bb b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio_11.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/pulseaudio/pulseaudio_11.1.bb
rename to poky/meta/recipes-multimedia/pulseaudio/pulseaudio_11.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/sbc/sbc_1.3.bb b/poky/meta/recipes-multimedia/sbc/sbc_1.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/sbc/sbc_1.3.bb
rename to poky/meta/recipes-multimedia/sbc/sbc_1.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/speex/speex_1.2.0.bb b/poky/meta/recipes-multimedia/speex/speex_1.2.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/speex/speex_1.2.0.bb
rename to poky/meta/recipes-multimedia/speex/speex_1.2.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/speex/speexdsp/0001-Don-t-rely-on-HAVE_STDINT_H-et-al.-being-defined.patch b/poky/meta/recipes-multimedia/speex/speexdsp/0001-Don-t-rely-on-HAVE_STDINT_H-et-al.-being-defined.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/speex/speexdsp/0001-Don-t-rely-on-HAVE_STDINT_H-et-al.-being-defined.patch
rename to poky/meta/recipes-multimedia/speex/speexdsp/0001-Don-t-rely-on-HAVE_STDINT_H-et-al.-being-defined.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/speex/speexdsp_1.2rc3.bb b/poky/meta/recipes-multimedia/speex/speexdsp_1.2rc3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/speex/speexdsp_1.2rc3.bb
rename to poky/meta/recipes-multimedia/speex/speexdsp_1.2rc3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/webp/libwebp_0.6.1.bb b/poky/meta/recipes-multimedia/webp/libwebp_0.6.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/webp/libwebp_0.6.1.bb
rename to poky/meta/recipes-multimedia/webp/libwebp_0.6.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch b/poky/meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch
rename to poky/meta/recipes-multimedia/x264/x264/Fix-X32-build-by-disabling-asm.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch b/poky/meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch
rename to poky/meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch
diff --git a/import-layers/yocto-poky/meta/recipes-multimedia/x264/x264_git.bb b/poky/meta/recipes-multimedia/x264/x264_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-multimedia/x264/x264_git.bb
rename to poky/meta/recipes-multimedia/x264/x264_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-rt/README b/poky/meta/recipes-rt/README
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-rt/README
rename to poky/meta/recipes-rt/README
diff --git a/import-layers/yocto-poky/meta/recipes-rt/images/core-image-rt-sdk.bb b/poky/meta/recipes-rt/images/core-image-rt-sdk.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-rt/images/core-image-rt-sdk.bb
rename to poky/meta/recipes-rt/images/core-image-rt-sdk.bb
diff --git a/import-layers/yocto-poky/meta/recipes-rt/images/core-image-rt.bb b/poky/meta/recipes-rt/images/core-image-rt.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-rt/images/core-image-rt.bb
rename to poky/meta/recipes-rt/images/core-image-rt.bb
diff --git a/import-layers/yocto-poky/meta/recipes-rt/rt-tests/files/rt_bmark.py b/poky/meta/recipes-rt/rt-tests/files/rt_bmark.py
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-rt/rt-tests/files/rt_bmark.py
rename to poky/meta/recipes-rt/rt-tests/files/rt_bmark.py
diff --git a/import-layers/yocto-poky/meta/recipes-rt/rt-tests/files/run-ptest b/poky/meta/recipes-rt/rt-tests/files/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-rt/rt-tests/files/run-ptest
rename to poky/meta/recipes-rt/rt-tests/files/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-rt/rt-tests/hwlatdetect_1.1.bb b/poky/meta/recipes-rt/rt-tests/hwlatdetect_1.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-rt/rt-tests/hwlatdetect_1.1.bb
rename to poky/meta/recipes-rt/rt-tests/hwlatdetect_1.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-rt/rt-tests/rt-tests.inc b/poky/meta/recipes-rt/rt-tests/rt-tests.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-rt/rt-tests/rt-tests.inc
rename to poky/meta/recipes-rt/rt-tests/rt-tests.inc
diff --git a/import-layers/yocto-poky/meta/recipes-rt/rt-tests/rt-tests_1.1.bb b/poky/meta/recipes-rt/rt-tests/rt-tests_1.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-rt/rt-tests/rt-tests_1.1.bb
rename to poky/meta/recipes-rt/rt-tests/rt-tests_1.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-sato/images/core-image-sato-dev.bb b/poky/meta/recipes-sato/images/core-image-sato-dev.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/images/core-image-sato-dev.bb
rename to poky/meta/recipes-sato/images/core-image-sato-dev.bb
diff --git a/import-layers/yocto-poky/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb b/poky/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb
rename to poky/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb
diff --git a/import-layers/yocto-poky/meta/recipes-sato/images/core-image-sato-sdk.bb b/poky/meta/recipes-sato/images/core-image-sato-sdk.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/images/core-image-sato-sdk.bb
rename to poky/meta/recipes-sato/images/core-image-sato-sdk.bb
diff --git a/import-layers/yocto-poky/meta/recipes-sato/images/core-image-sato.bb b/poky/meta/recipes-sato/images/core-image-sato.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/images/core-image-sato.bb
rename to poky/meta/recipes-sato/images/core-image-sato.bb
diff --git a/import-layers/yocto-poky/meta/recipes-sato/l3afpad/l3afpad_git.bb b/poky/meta/recipes-sato/l3afpad/l3afpad_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/l3afpad/l3afpad_git.bb
rename to poky/meta/recipes-sato/l3afpad/l3afpad_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch b/poky/meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch
rename to poky/meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch
diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb b/poky/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb
rename to poky/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/files/vfolders/All.directory b/poky/meta/recipes-sato/matchbox-desktop/files/vfolders/All.directory
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/files/vfolders/All.directory
rename to poky/meta/recipes-sato/matchbox-desktop/files/vfolders/All.directory
diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/files/vfolders/Applications.directory b/poky/meta/recipes-sato/matchbox-desktop/files/vfolders/Applications.directory
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/files/vfolders/Applications.directory
rename to poky/meta/recipes-sato/matchbox-desktop/files/vfolders/Applications.directory
diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/files/vfolders/Games.directory b/poky/meta/recipes-sato/matchbox-desktop/files/vfolders/Games.directory
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/files/vfolders/Games.directory
rename to poky/meta/recipes-sato/matchbox-desktop/files/vfolders/Games.directory
diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/files/vfolders/Root.order b/poky/meta/recipes-sato/matchbox-desktop/files/vfolders/Root.order
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/files/vfolders/Root.order
rename to poky/meta/recipes-sato/matchbox-desktop/files/vfolders/Root.order
diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/files/vfolders/Settings.directory b/poky/meta/recipes-sato/matchbox-desktop/files/vfolders/Settings.directory
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/files/vfolders/Settings.directory
rename to poky/meta/recipes-sato/matchbox-desktop/files/vfolders/Settings.directory
diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb b/poky/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb
rename to poky/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-keyboard/files/0001-desktop-file-Hide-the-keyboard-from-app-list.patch b/poky/meta/recipes-sato/matchbox-keyboard/files/0001-desktop-file-Hide-the-keyboard-from-app-list.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/matchbox-keyboard/files/0001-desktop-file-Hide-the-keyboard-from-app-list.patch
rename to poky/meta/recipes-sato/matchbox-keyboard/files/0001-desktop-file-Hide-the-keyboard-from-app-list.patch
diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh b/poky/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh
rename to poky/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh
diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb b/poky/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb
rename to poky/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-panel-2/files/0001-applets-systray-Allow-icons-to-be-smaller.patch b/poky/meta/recipes-sato/matchbox-panel-2/files/0001-applets-systray-Allow-icons-to-be-smaller.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/matchbox-panel-2/files/0001-applets-systray-Allow-icons-to-be-smaller.patch
rename to poky/meta/recipes-sato/matchbox-panel-2/files/0001-applets-systray-Allow-icons-to-be-smaller.patch
diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb b/poky/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb
rename to poky/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb
diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato/index.theme b/poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato/index.theme
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato/index.theme
rename to poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato/index.theme
diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session b/poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session
rename to poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session
diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb b/poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb
rename to poky/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.1.bb b/poky/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.1.bb
rename to poky/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato.inc b/poky/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato.inc
rename to poky/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato.inc
diff --git a/import-layers/yocto-poky/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.2.bb b/poky/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.2.bb
rename to poky/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/poky/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
rename to poky/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
diff --git a/import-layers/yocto-poky/meta/recipes-sato/pcmanfm/files/emblem-symbolic-link.png b/poky/meta/recipes-sato/pcmanfm/files/emblem-symbolic-link.png
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/pcmanfm/files/emblem-symbolic-link.png
rename to poky/meta/recipes-sato/pcmanfm/files/emblem-symbolic-link.png
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-sato/pcmanfm/files/gnome-fs-directory.png b/poky/meta/recipes-sato/pcmanfm/files/gnome-fs-directory.png
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/pcmanfm/files/gnome-fs-directory.png
rename to poky/meta/recipes-sato/pcmanfm/files/gnome-fs-directory.png
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-sato/pcmanfm/files/gnome-fs-regular.png b/poky/meta/recipes-sato/pcmanfm/files/gnome-fs-regular.png
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/pcmanfm/files/gnome-fs-regular.png
rename to poky/meta/recipes-sato/pcmanfm/files/gnome-fs-regular.png
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-sato/pcmanfm/files/gnome-mime-text-plain.png b/poky/meta/recipes-sato/pcmanfm/files/gnome-mime-text-plain.png
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/pcmanfm/files/gnome-mime-text-plain.png
rename to poky/meta/recipes-sato/pcmanfm/files/gnome-mime-text-plain.png
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-sato/pcmanfm/files/no-desktop.patch b/poky/meta/recipes-sato/pcmanfm/files/no-desktop.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/pcmanfm/files/no-desktop.patch
rename to poky/meta/recipes-sato/pcmanfm/files/no-desktop.patch
diff --git a/import-layers/yocto-poky/meta/recipes-sato/pcmanfm/pcmanfm_1.2.5.bb b/poky/meta/recipes-sato/pcmanfm/pcmanfm_1.2.5.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/pcmanfm/pcmanfm_1.2.5.bb
rename to poky/meta/recipes-sato/pcmanfm/pcmanfm_1.2.5.bb
diff --git a/import-layers/yocto-poky/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato/50-sato.conf b/poky/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato/50-sato.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato/50-sato.conf
rename to poky/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato/50-sato.conf
diff --git a/import-layers/yocto-poky/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb b/poky/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb
rename to poky/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-sato/puzzles/files/0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch b/poky/meta/recipes-sato/puzzles/files/0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/puzzles/files/0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch
rename to poky/meta/recipes-sato/puzzles/files/0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch
diff --git a/import-layers/yocto-poky/meta/recipes-sato/puzzles/files/0001-Use-labs-instead-of-abs.patch b/poky/meta/recipes-sato/puzzles/files/0001-Use-labs-instead-of-abs.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/puzzles/files/0001-Use-labs-instead-of-abs.patch
rename to poky/meta/recipes-sato/puzzles/files/0001-Use-labs-instead-of-abs.patch
diff --git a/import-layers/yocto-poky/meta/recipes-sato/puzzles/files/0001-palisade-Fix-warnings-with-clang-on-arm.patch b/poky/meta/recipes-sato/puzzles/files/0001-palisade-Fix-warnings-with-clang-on-arm.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/puzzles/files/0001-palisade-Fix-warnings-with-clang-on-arm.patch
rename to poky/meta/recipes-sato/puzzles/files/0001-palisade-Fix-warnings-with-clang-on-arm.patch
diff --git a/import-layers/yocto-poky/meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch b/poky/meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch
rename to poky/meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch
diff --git a/import-layers/yocto-poky/meta/recipes-sato/puzzles/puzzles_git.bb b/poky/meta/recipes-sato/puzzles/puzzles_git.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/puzzles/puzzles_git.bb
rename to poky/meta/recipes-sato/puzzles/puzzles_git.bb
diff --git a/import-layers/yocto-poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc b/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc
rename to poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc
diff --git a/import-layers/yocto-poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.desktop b/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.desktop
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.desktop
rename to poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.desktop
diff --git a/import-layers/yocto-poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.png b/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.png
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.png
rename to poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.png
Binary files differ
diff --git a/import-layers/yocto-poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode/xwc.patch b/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode/xwc.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode/xwc.patch
rename to poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode/xwc.patch
diff --git a/import-layers/yocto-poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.22.bb b/poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.22.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.22.bb
rename to poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.22.bb
diff --git a/import-layers/yocto-poky/meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb b/poky/meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb
rename to poky/meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-sato/settings-daemon/files/70settings-daemon.sh b/poky/meta/recipes-sato/settings-daemon/files/70settings-daemon.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/settings-daemon/files/70settings-daemon.sh
rename to poky/meta/recipes-sato/settings-daemon/files/70settings-daemon.sh
diff --git a/import-layers/yocto-poky/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch b/poky/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch
rename to poky/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch
diff --git a/import-layers/yocto-poky/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb b/poky/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb
rename to poky/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb b/poky/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb
rename to poky/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb
diff --git a/import-layers/yocto-poky/meta/recipes-sato/shutdown-desktop/shutdown-desktop/shutdown.desktop b/poky/meta/recipes-sato/shutdown-desktop/shutdown-desktop/shutdown.desktop
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/shutdown-desktop/shutdown-desktop/shutdown.desktop
rename to poky/meta/recipes-sato/shutdown-desktop/shutdown-desktop/shutdown.desktop
diff --git a/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch
rename to poky/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch
diff --git a/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch
rename to poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-gles3-header-when-gles2-is-enabled.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-gles3-header-when-gles2-is-enabled.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-gles3-header-when-gles2-is-enabled.patch
rename to poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-gles3-header-when-gles2-is-enabled.patch
diff --git a/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch
rename to poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch
diff --git a/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch
rename to poky/meta/recipes-sato/webkit/webkitgtk/0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch
diff --git a/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch
rename to poky/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch
diff --git a/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
rename to poky/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch
diff --git a/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch
rename to poky/meta/recipes-sato/webkit/webkitgtk/0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/cross-compile.patch b/poky/meta/recipes-sato/webkit/webkitgtk/cross-compile.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/cross-compile.patch
rename to poky/meta/recipes-sato/webkit/webkitgtk/cross-compile.patch
diff --git a/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch b/poky/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch
rename to poky/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch
diff --git a/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/fix-configure-failure-aarch64.patch b/poky/meta/recipes-sato/webkit/webkitgtk/fix-configure-failure-aarch64.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/fix-configure-failure-aarch64.patch
rename to poky/meta/recipes-sato/webkit/webkitgtk/fix-configure-failure-aarch64.patch
diff --git a/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/x32_support.patch b/poky/meta/recipes-sato/webkit/webkitgtk/x32_support.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/x32_support.patch
rename to poky/meta/recipes-sato/webkit/webkitgtk/x32_support.patch
diff --git a/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb b/poky/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb
rename to poky/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/apr/apr-util/configfix.patch b/poky/meta/recipes-support/apr/apr-util/configfix.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/apr/apr-util/configfix.patch
rename to poky/meta/recipes-support/apr/apr-util/configfix.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/apr/apr-util/configure_fixes.patch b/poky/meta/recipes-support/apr/apr-util/configure_fixes.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/apr/apr-util/configure_fixes.patch
rename to poky/meta/recipes-support/apr/apr-util/configure_fixes.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/apr/apr-util/run-ptest b/poky/meta/recipes-support/apr/apr-util/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/apr/apr-util/run-ptest
rename to poky/meta/recipes-support/apr/apr-util/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-support/apr/apr-util_1.6.1.bb b/poky/meta/recipes-support/apr/apr-util_1.6.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/apr/apr-util_1.6.1.bb
rename to poky/meta/recipes-support/apr/apr-util_1.6.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/apr/apr/0001-build-buildcheck.sh-improve-libtool-detection.patch b/poky/meta/recipes-support/apr/apr/0001-build-buildcheck.sh-improve-libtool-detection.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/apr/apr/0001-build-buildcheck.sh-improve-libtool-detection.patch
rename to poky/meta/recipes-support/apr/apr/0001-build-buildcheck.sh-improve-libtool-detection.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/apr/apr/0002-apr-Remove-workdir-path-references-from-installed-ap.patch b/poky/meta/recipes-support/apr/apr/0002-apr-Remove-workdir-path-references-from-installed-ap.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/apr/apr/0002-apr-Remove-workdir-path-references-from-installed-ap.patch
rename to poky/meta/recipes-support/apr/apr/0002-apr-Remove-workdir-path-references-from-installed-ap.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/apr/apr/0003-Makefile.in-configure.in-support-cross-compiling.patch b/poky/meta/recipes-support/apr/apr/0003-Makefile.in-configure.in-support-cross-compiling.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/apr/apr/0003-Makefile.in-configure.in-support-cross-compiling.patch
rename to poky/meta/recipes-support/apr/apr/0003-Makefile.in-configure.in-support-cross-compiling.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/apr/apr/0004-Fix-packet-discards-HTTP-redirect.patch b/poky/meta/recipes-support/apr/apr/0004-Fix-packet-discards-HTTP-redirect.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/apr/apr/0004-Fix-packet-discards-HTTP-redirect.patch
rename to poky/meta/recipes-support/apr/apr/0004-Fix-packet-discards-HTTP-redirect.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/apr/apr/0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch b/poky/meta/recipes-support/apr/apr/0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/apr/apr/0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch
rename to poky/meta/recipes-support/apr/apr/0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/apr/apr/0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch b/poky/meta/recipes-support/apr/apr/0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/apr/apr/0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch
rename to poky/meta/recipes-support/apr/apr/0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/apr/apr/0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch b/poky/meta/recipes-support/apr/apr/0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/apr/apr/0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch
rename to poky/meta/recipes-support/apr/apr/0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/apr/apr/run-ptest b/poky/meta/recipes-support/apr/apr/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/apr/apr/run-ptest
rename to poky/meta/recipes-support/apr/apr/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-support/apr/apr_1.6.3.bb b/poky/meta/recipes-support/apr/apr_1.6.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/apr/apr_1.6.3.bb
rename to poky/meta/recipes-support/apr/apr_1.6.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/argp-standalone/argp-standalone_1.3.bb b/poky/meta/recipes-support/argp-standalone/argp-standalone_1.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/argp-standalone/argp-standalone_1.3.bb
rename to poky/meta/recipes-support/argp-standalone/argp-standalone_1.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/argp-standalone/files/0001-throw-in-funcdef.patch b/poky/meta/recipes-support/argp-standalone/files/0001-throw-in-funcdef.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/argp-standalone/files/0001-throw-in-funcdef.patch
rename to poky/meta/recipes-support/argp-standalone/files/0001-throw-in-funcdef.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/argp-standalone/files/0002-isprint.patch b/poky/meta/recipes-support/argp-standalone/files/0002-isprint.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/argp-standalone/files/0002-isprint.patch
rename to poky/meta/recipes-support/argp-standalone/files/0002-isprint.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/argp-standalone/files/out_of_tree_build.patch b/poky/meta/recipes-support/argp-standalone/files/out_of_tree_build.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/argp-standalone/files/out_of_tree_build.patch
rename to poky/meta/recipes-support/argp-standalone/files/out_of_tree_build.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/aspell/aspell/gcc7.patch b/poky/meta/recipes-support/aspell/aspell/gcc7.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/aspell/aspell/gcc7.patch
rename to poky/meta/recipes-support/aspell/aspell/gcc7.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/aspell/aspell_0.60.6.1.bb b/poky/meta/recipes-support/aspell/aspell_0.60.6.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/aspell/aspell_0.60.6.1.bb
rename to poky/meta/recipes-support/aspell/aspell_0.60.6.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-atk_2.26.1.bb b/poky/meta/recipes-support/atk/at-spi2-atk_2.26.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-atk_2.26.1.bb
rename to poky/meta/recipes-support/atk/at-spi2-atk_2.26.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch b/poky/meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch
rename to poky/meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-core_2.26.2.bb b/poky/meta/recipes-support/atk/at-spi2-core_2.26.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-core_2.26.2.bb
rename to poky/meta/recipes-support/atk/at-spi2-core_2.26.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/atk/atk_2.26.1.bb b/poky/meta/recipes-support/atk/atk_2.26.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/atk/atk_2.26.1.bb
rename to poky/meta/recipes-support/atk/atk_2.26.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/attr/acl/Makefile-libacl-should-depend-on-include.patch b/poky/meta/recipes-support/attr/acl/Makefile-libacl-should-depend-on-include.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/attr/acl/Makefile-libacl-should-depend-on-include.patch
rename to poky/meta/recipes-support/attr/acl/Makefile-libacl-should-depend-on-include.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/attr/acl/acl-fix-the-order-of-expected-output-of-getfacl.patch b/poky/meta/recipes-support/attr/acl/acl-fix-the-order-of-expected-output-of-getfacl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/attr/acl/acl-fix-the-order-of-expected-output-of-getfacl.patch
rename to poky/meta/recipes-support/attr/acl/acl-fix-the-order-of-expected-output-of-getfacl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/attr/acl/configure.ac b/poky/meta/recipes-support/attr/acl/configure.ac
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/attr/acl/configure.ac
rename to poky/meta/recipes-support/attr/acl/configure.ac
diff --git a/import-layers/yocto-poky/meta/recipes-support/attr/acl/run-ptest b/poky/meta/recipes-support/attr/acl/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/attr/acl/run-ptest
rename to poky/meta/recipes-support/attr/acl/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-support/attr/acl/test-fix-directory-permissions.patch b/poky/meta/recipes-support/attr/acl/test-fix-directory-permissions.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/attr/acl/test-fix-directory-permissions.patch
rename to poky/meta/recipes-support/attr/acl/test-fix-directory-permissions.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/attr/acl/test-fix-insufficient-quoting-of.patch b/poky/meta/recipes-support/attr/acl/test-fix-insufficient-quoting-of.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/attr/acl/test-fix-insufficient-quoting-of.patch
rename to poky/meta/recipes-support/attr/acl/test-fix-insufficient-quoting-of.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/attr/acl/test-fixups-on-SELinux-machines-for-root-testcases.patch b/poky/meta/recipes-support/attr/acl/test-fixups-on-SELinux-machines-for-root-testcases.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/attr/acl/test-fixups-on-SELinux-machines-for-root-testcases.patch
rename to poky/meta/recipes-support/attr/acl/test-fixups-on-SELinux-machines-for-root-testcases.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/attr/acl_2.2.52.bb b/poky/meta/recipes-support/attr/acl_2.2.52.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/attr/acl_2.2.52.bb
rename to poky/meta/recipes-support/attr/acl_2.2.52.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/attr/attr.inc b/poky/meta/recipes-support/attr/attr.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/attr/attr.inc
rename to poky/meta/recipes-support/attr/attr.inc
diff --git a/import-layers/yocto-poky/meta/recipes-support/attr/attr/0001-Use-stdint-types-consistently.patch b/poky/meta/recipes-support/attr/attr/0001-Use-stdint-types-consistently.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/attr/attr/0001-Use-stdint-types-consistently.patch
rename to poky/meta/recipes-support/attr/attr/0001-Use-stdint-types-consistently.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/attr/attr/attr-Missing-configure.ac.patch b/poky/meta/recipes-support/attr/attr/attr-Missing-configure.ac.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/attr/attr/attr-Missing-configure.ac.patch
rename to poky/meta/recipes-support/attr/attr/attr-Missing-configure.ac.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/attr/attr/dont-use-decl-macros.patch b/poky/meta/recipes-support/attr/attr/dont-use-decl-macros.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/attr/attr/dont-use-decl-macros.patch
rename to poky/meta/recipes-support/attr/attr/dont-use-decl-macros.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/attr/attr_2.4.47.bb b/poky/meta/recipes-support/attr/attr_2.4.47.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/attr/attr_2.4.47.bb
rename to poky/meta/recipes-support/attr/attr_2.4.47.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/attr/ea-acl.inc b/poky/meta/recipes-support/attr/ea-acl.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/attr/ea-acl.inc
rename to poky/meta/recipes-support/attr/ea-acl.inc
diff --git a/import-layers/yocto-poky/meta/recipes-support/attr/files/0001-Added-configure-option-to-enable-disable-static-libr.patch b/poky/meta/recipes-support/attr/files/0001-Added-configure-option-to-enable-disable-static-libr.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/attr/files/0001-Added-configure-option-to-enable-disable-static-libr.patch
rename to poky/meta/recipes-support/attr/files/0001-Added-configure-option-to-enable-disable-static-libr.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/attr/files/Remove-the-attr.5-man-page-moved-to-man-pages.patch b/poky/meta/recipes-support/attr/files/Remove-the-attr.5-man-page-moved-to-man-pages.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/attr/files/Remove-the-attr.5-man-page-moved-to-man-pages.patch
rename to poky/meta/recipes-support/attr/files/Remove-the-attr.5-man-page-moved-to-man-pages.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/attr/files/Remove-the-section-2-man-pages.patch b/poky/meta/recipes-support/attr/files/Remove-the-section-2-man-pages.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/attr/files/Remove-the-section-2-man-pages.patch
rename to poky/meta/recipes-support/attr/files/Remove-the-section-2-man-pages.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/attr/files/relative-libdir.patch b/poky/meta/recipes-support/attr/files/relative-libdir.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/attr/files/relative-libdir.patch
rename to poky/meta/recipes-support/attr/files/relative-libdir.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/attr/files/run-ptest b/poky/meta/recipes-support/attr/files/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/attr/files/run-ptest
rename to poky/meta/recipes-support/attr/files/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-support/bash-completion/bash-completion_2.7.bb b/poky/meta/recipes-support/bash-completion/bash-completion_2.7.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/bash-completion/bash-completion_2.7.bb
rename to poky/meta/recipes-support/bash-completion/bash-completion_2.7.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/beecrypt/beecrypt/add-option-dev-dsp.patch b/poky/meta/recipes-support/beecrypt/beecrypt/add-option-dev-dsp.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/beecrypt/beecrypt/add-option-dev-dsp.patch
rename to poky/meta/recipes-support/beecrypt/beecrypt/add-option-dev-dsp.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/beecrypt/beecrypt/beecrypt-enable-ptest-support.patch b/poky/meta/recipes-support/beecrypt/beecrypt/beecrypt-enable-ptest-support.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/beecrypt/beecrypt/beecrypt-enable-ptest-support.patch
rename to poky/meta/recipes-support/beecrypt/beecrypt/beecrypt-enable-ptest-support.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch b/poky/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch
rename to poky/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/beecrypt/beecrypt/fix-for-gcc-4.7.patch b/poky/meta/recipes-support/beecrypt/beecrypt/fix-for-gcc-4.7.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/beecrypt/beecrypt/fix-for-gcc-4.7.patch
rename to poky/meta/recipes-support/beecrypt/beecrypt/fix-for-gcc-4.7.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/beecrypt/beecrypt/fix-security.patch b/poky/meta/recipes-support/beecrypt/beecrypt/fix-security.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/beecrypt/beecrypt/fix-security.patch
rename to poky/meta/recipes-support/beecrypt/beecrypt/fix-security.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/beecrypt/beecrypt/run-ptest b/poky/meta/recipes-support/beecrypt/beecrypt/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/beecrypt/beecrypt/run-ptest
rename to poky/meta/recipes-support/beecrypt/beecrypt/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb b/poky/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb
rename to poky/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/bmap-tools/bmap-tools_3.4.bb b/poky/meta/recipes-support/bmap-tools/bmap-tools_3.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/bmap-tools/bmap-tools_3.4.bb
rename to poky/meta/recipes-support/bmap-tools/bmap-tools_3.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/boost/bjam-native_1.66.0.bb b/poky/meta/recipes-support/boost/bjam-native_1.66.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/boost/bjam-native_1.66.0.bb
rename to poky/meta/recipes-support/boost/bjam-native_1.66.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/boost/boost-1.66.0.inc b/poky/meta/recipes-support/boost/boost-1.66.0.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/boost/boost-1.66.0.inc
rename to poky/meta/recipes-support/boost/boost-1.66.0.inc
diff --git a/import-layers/yocto-poky/meta/recipes-support/boost/boost.inc b/poky/meta/recipes-support/boost/boost.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/boost/boost.inc
rename to poky/meta/recipes-support/boost/boost.inc
diff --git a/import-layers/yocto-poky/meta/recipes-support/boost/boost/0001-Apply-boost-1.62.0-no-forced-flags.patch.patch b/poky/meta/recipes-support/boost/boost/0001-Apply-boost-1.62.0-no-forced-flags.patch.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/boost/boost/0001-Apply-boost-1.62.0-no-forced-flags.patch.patch
rename to poky/meta/recipes-support/boost/boost/0001-Apply-boost-1.62.0-no-forced-flags.patch.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/boost/boost/0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch b/poky/meta/recipes-support/boost/boost/0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/boost/boost/0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch
rename to poky/meta/recipes-support/boost/boost/0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/boost/boost/0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch b/poky/meta/recipes-support/boost/boost/0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/boost/boost/0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch
rename to poky/meta/recipes-support/boost/boost/0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/boost/boost/arm-intrinsics.patch b/poky/meta/recipes-support/boost/boost/arm-intrinsics.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/boost/boost/arm-intrinsics.patch
rename to poky/meta/recipes-support/boost/boost/arm-intrinsics.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/boost/boost/boost-CVE-2012-2677.patch b/poky/meta/recipes-support/boost/boost/boost-CVE-2012-2677.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/boost/boost/boost-CVE-2012-2677.patch
rename to poky/meta/recipes-support/boost/boost/boost-CVE-2012-2677.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/boost/boost/boost-math-disable-pch-for-gcc.patch b/poky/meta/recipes-support/boost/boost/boost-math-disable-pch-for-gcc.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/boost/boost/boost-math-disable-pch-for-gcc.patch
rename to poky/meta/recipes-support/boost/boost/boost-math-disable-pch-for-gcc.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/boost/boost_1.66.0.bb b/poky/meta/recipes-support/boost/boost_1.66.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/boost/boost_1.66.0.bb
rename to poky/meta/recipes-support/boost/boost_1.66.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/boost/files/0001-Fix-a-strange-assert-typo-how-was-this-released-with.patch b/poky/meta/recipes-support/boost/files/0001-Fix-a-strange-assert-typo-how-was-this-released-with.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/boost/files/0001-Fix-a-strange-assert-typo-how-was-this-released-with.patch
rename to poky/meta/recipes-support/boost/files/0001-Fix-a-strange-assert-typo-how-was-this-released-with.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/boost/files/bjam-native-build-bjam.debug.patch b/poky/meta/recipes-support/boost/files/bjam-native-build-bjam.debug.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/boost/files/bjam-native-build-bjam.debug.patch
rename to poky/meta/recipes-support/boost/files/bjam-native-build-bjam.debug.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch b/poky/meta/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch
rename to poky/meta/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch b/poky/meta/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch
rename to poky/meta/recipes-support/ca-certificates/ca-certificates/0002-update-ca-certificates-use-SYSROOT.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates/0003-update-ca-certificates-use-relative-symlinks-from-ET.patch b/poky/meta/recipes-support/ca-certificates/ca-certificates/0003-update-ca-certificates-use-relative-symlinks-from-ET.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates/0003-update-ca-certificates-use-relative-symlinks-from-ET.patch
rename to poky/meta/recipes-support/ca-certificates/ca-certificates/0003-update-ca-certificates-use-relative-symlinks-from-ET.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates/default-sysroot.patch b/poky/meta/recipes-support/ca-certificates/ca-certificates/default-sysroot.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates/default-sysroot.patch
rename to poky/meta/recipes-support/ca-certificates/ca-certificates/default-sysroot.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates/sbindir.patch b/poky/meta/recipes-support/ca-certificates/ca-certificates/sbindir.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates/sbindir.patch
rename to poky/meta/recipes-support/ca-certificates/ca-certificates/sbindir.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates/update-ca-certificates-support-Toybox.patch b/poky/meta/recipes-support/ca-certificates/ca-certificates/update-ca-certificates-support-Toybox.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates/update-ca-certificates-support-Toybox.patch
rename to poky/meta/recipes-support/ca-certificates/ca-certificates/update-ca-certificates-support-Toybox.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates_20170717.bb b/poky/meta/recipes-support/ca-certificates/ca-certificates_20170717.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/ca-certificates/ca-certificates_20170717.bb
rename to poky/meta/recipes-support/ca-certificates/ca-certificates_20170717.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/consolekit/consolekit/add-polkit-configure-argument.patch b/poky/meta/recipes-support/consolekit/consolekit/add-polkit-configure-argument.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/consolekit/consolekit/add-polkit-configure-argument.patch
rename to poky/meta/recipes-support/consolekit/consolekit/add-polkit-configure-argument.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/consolekit/consolekit/sepbuildfix.patch b/poky/meta/recipes-support/consolekit/consolekit/sepbuildfix.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/consolekit/consolekit/sepbuildfix.patch
rename to poky/meta/recipes-support/consolekit/consolekit/sepbuildfix.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/consolekit/consolekit_0.4.6.bb b/poky/meta/recipes-support/consolekit/consolekit_0.4.6.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/consolekit/consolekit_0.4.6.bb
rename to poky/meta/recipes-support/consolekit/consolekit_0.4.6.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch b/poky/meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch
rename to poky/meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/curl/curl_7.60.0.bb b/poky/meta/recipes-support/curl/curl_7.60.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/curl/curl_7.60.0.bb
rename to poky/meta/recipes-support/curl/curl_7.60.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/db/db/0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch b/poky/meta/recipes-support/db/db/0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/db/db/0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch
rename to poky/meta/recipes-support/db/db/0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/db/db/0001-configure-Add-explicit-tag-options-to-libtool-invoca.patch b/poky/meta/recipes-support/db/db/0001-configure-Add-explicit-tag-options-to-libtool-invoca.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/db/db/0001-configure-Add-explicit-tag-options-to-libtool-invoca.patch
rename to poky/meta/recipes-support/db/db/0001-configure-Add-explicit-tag-options-to-libtool-invoca.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch b/poky/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch
rename to poky/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/db/db/fix-parallel-build.patch b/poky/meta/recipes-support/db/db/fix-parallel-build.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/db/db/fix-parallel-build.patch
rename to poky/meta/recipes-support/db/db/fix-parallel-build.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/db/db/sequence-type.patch b/poky/meta/recipes-support/db/db/sequence-type.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/db/db/sequence-type.patch
rename to poky/meta/recipes-support/db/db/sequence-type.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/db/db_5.3.28.bb b/poky/meta/recipes-support/db/db_5.3.28.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/db/db_5.3.28.bb
rename to poky/meta/recipes-support/db/db_5.3.28.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/debianutils/debianutils_4.8.4.bb b/poky/meta/recipes-support/debianutils/debianutils_4.8.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/debianutils/debianutils_4.8.4.bb
rename to poky/meta/recipes-support/debianutils/debianutils_4.8.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/enchant/enchant_1.6.0.bb b/poky/meta/recipes-support/enchant/enchant_1.6.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/enchant/enchant_1.6.0.bb
rename to poky/meta/recipes-support/enchant/enchant_1.6.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/gdbm/files/ptest.patch b/poky/meta/recipes-support/gdbm/files/ptest.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/gdbm/files/ptest.patch
rename to poky/meta/recipes-support/gdbm/files/ptest.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/gdbm/files/run-ptest b/poky/meta/recipes-support/gdbm/files/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/gdbm/files/run-ptest
rename to poky/meta/recipes-support/gdbm/files/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-support/gdbm/gdbm_1.14.1.bb b/poky/meta/recipes-support/gdbm/gdbm_1.14.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/gdbm/gdbm_1.14.1.bb
rename to poky/meta/recipes-support/gdbm/gdbm_1.14.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/gmp/gmp-6.1.2/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch b/poky/meta/recipes-support/gmp/gmp-6.1.2/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/gmp/gmp-6.1.2/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch
rename to poky/meta/recipes-support/gmp/gmp-6.1.2/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch b/poky/meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch
rename to poky/meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch b/poky/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch
rename to poky/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch b/poky/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch
rename to poky/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/gmp/gmp.inc b/poky/meta/recipes-support/gmp/gmp.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/gmp/gmp.inc
rename to poky/meta/recipes-support/gmp/gmp.inc
diff --git a/import-layers/yocto-poky/meta/recipes-support/gmp/gmp_6.1.2.bb b/poky/meta/recipes-support/gmp/gmp_6.1.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/gmp/gmp_6.1.2.bb
rename to poky/meta/recipes-support/gmp/gmp_6.1.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/0001-gsystem-subprocess.c-Enable-GNU-extensions-in-system.patch b/poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/0001-gsystem-subprocess.c-Enable-GNU-extensions-in-system.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/0001-gsystem-subprocess.c-Enable-GNU-extensions-in-system.patch
rename to poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/0001-gsystem-subprocess.c-Enable-GNU-extensions-in-system.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/update-output-syntax.patch b/poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/update-output-syntax.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/update-output-syntax.patch
rename to poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/update-output-syntax.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2014.1.bb b/poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2014.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2014.1.bb
rename to poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2014.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg/0001-Use-pkg-config-to-find-pth-instead-of-pth-config.patch b/poky/meta/recipes-support/gnupg/gnupg/0001-Use-pkg-config-to-find-pth-instead-of-pth-config.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg/0001-Use-pkg-config-to-find-pth-instead-of-pth-config.patch
rename to poky/meta/recipes-support/gnupg/gnupg/0001-Use-pkg-config-to-find-pth-instead-of-pth-config.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch b/poky/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch
rename to poky/meta/recipes-support/gnupg/gnupg/0001-configure.ac-use-a-custom-value-for-the-location-of-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch b/poky/meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch
rename to poky/meta/recipes-support/gnupg/gnupg/0002-use-pkgconfig-instead-of-npth-config.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg/0003-dirmngr-uses-libgpg-error.patch b/poky/meta/recipes-support/gnupg/gnupg/0003-dirmngr-uses-libgpg-error.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg/0003-dirmngr-uses-libgpg-error.patch
rename to poky/meta/recipes-support/gnupg/gnupg/0003-dirmngr-uses-libgpg-error.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch b/poky/meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch
rename to poky/meta/recipes-support/gnupg/gnupg/0004-autogen.sh-fix-find-version-for-beta-checking.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg_2.2.4.bb b/poky/meta/recipes-support/gnupg/gnupg_2.2.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/gnupg/gnupg_2.2.4.bb
rename to poky/meta/recipes-support/gnupg/gnupg_2.2.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls.inc b/poky/meta/recipes-support/gnutls/gnutls.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls.inc
rename to poky/meta/recipes-support/gnutls/gnutls.inc
diff --git a/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch b/poky/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch
rename to poky/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls/arm_eabi.patch b/poky/meta/recipes-support/gnutls/gnutls/arm_eabi.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls/arm_eabi.patch
rename to poky/meta/recipes-support/gnutls/gnutls/arm_eabi.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls_3.6.1.bb b/poky/meta/recipes-support/gnutls/gnutls_3.6.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/gnutls/gnutls_3.6.1.bb
rename to poky/meta/recipes-support/gnutls/gnutls_3.6.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/gnutls/libtasn1/0001-stdint.m4-reintroduce-GNULIB_OVERRIDES_WINT_T-check.patch b/poky/meta/recipes-support/gnutls/libtasn1/0001-stdint.m4-reintroduce-GNULIB_OVERRIDES_WINT_T-check.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/gnutls/libtasn1/0001-stdint.m4-reintroduce-GNULIB_OVERRIDES_WINT_T-check.patch
rename to poky/meta/recipes-support/gnutls/libtasn1/0001-stdint.m4-reintroduce-GNULIB_OVERRIDES_WINT_T-check.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/gnutls/libtasn1/dont-depend-on-help2man.patch b/poky/meta/recipes-support/gnutls/libtasn1/dont-depend-on-help2man.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/gnutls/libtasn1/dont-depend-on-help2man.patch
rename to poky/meta/recipes-support/gnutls/libtasn1/dont-depend-on-help2man.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/gnutls/libtasn1_4.13.bb b/poky/meta/recipes-support/gnutls/libtasn1_4.13.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/gnutls/libtasn1_4.13.bb
rename to poky/meta/recipes-support/gnutls/libtasn1_4.13.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch b/poky/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch
rename to poky/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch b/poky/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch
rename to poky/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch b/poky/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch
rename to poky/meta/recipes-support/gpgme/gpgme/0003-Correctly-install-python-modules.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0004-python-import.patch b/poky/meta/recipes-support/gpgme/gpgme/0004-python-import.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0004-python-import.patch
rename to poky/meta/recipes-support/gpgme/gpgme/0004-python-import.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch b/poky/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch
rename to poky/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch b/poky/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch
rename to poky/meta/recipes-support/gpgme/gpgme/0006-fix-build-path-issue.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0007-qt-python-Add-variables-to-tests.patch b/poky/meta/recipes-support/gpgme/gpgme/0007-qt-python-Add-variables-to-tests.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme/0007-qt-python-Add-variables-to-tests.patch
rename to poky/meta/recipes-support/gpgme/gpgme/0007-qt-python-Add-variables-to-tests.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme_1.10.0.bb b/poky/meta/recipes-support/gpgme/gpgme_1.10.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/gpgme/gpgme_1.10.0.bb
rename to poky/meta/recipes-support/gpgme/gpgme_1.10.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/icu/icu.inc b/poky/meta/recipes-support/icu/icu.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/icu/icu.inc
rename to poky/meta/recipes-support/icu/icu.inc
diff --git a/import-layers/yocto-poky/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch b/poky/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch
rename to poky/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch b/poky/meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch
rename to poky/meta/recipes-support/icu/icu/0001-i18n-Drop-include-xlocale.h.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/icu/icu/fix-install-manx.patch b/poky/meta/recipes-support/icu/icu/fix-install-manx.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/icu/icu/fix-install-manx.patch
rename to poky/meta/recipes-support/icu/icu/fix-install-manx.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/icu/icu/icu-pkgdata-large-cmd.patch b/poky/meta/recipes-support/icu/icu/icu-pkgdata-large-cmd.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/icu/icu/icu-pkgdata-large-cmd.patch
rename to poky/meta/recipes-support/icu/icu/icu-pkgdata-large-cmd.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/icu/icu_60.2.bb b/poky/meta/recipes-support/icu/icu_60.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/icu/icu_60.2.bb
rename to poky/meta/recipes-support/icu/icu_60.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/iso-codes/iso-codes_3.77.bb b/poky/meta/recipes-support/iso-codes/iso-codes_3.77.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/iso-codes/iso-codes_3.77.bb
rename to poky/meta/recipes-support/iso-codes/iso-codes_3.77.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch b/poky/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch
rename to poky/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libassuan/libassuan_2.5.1.bb b/poky/meta/recipes-support/libassuan/libassuan_2.5.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libassuan/libassuan_2.5.1.bb
rename to poky/meta/recipes-support/libassuan/libassuan_2.5.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.2.bb b/poky/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.2.bb
rename to poky/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/libbsd/libbsd/0001-Replace-__BEGIN_DECLS-and-__END_DECLS.patch b/poky/meta/recipes-support/libbsd/libbsd/0001-Replace-__BEGIN_DECLS-and-__END_DECLS.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libbsd/libbsd/0001-Replace-__BEGIN_DECLS-and-__END_DECLS.patch
rename to poky/meta/recipes-support/libbsd/libbsd/0001-Replace-__BEGIN_DECLS-and-__END_DECLS.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libbsd/libbsd/0001-src-libbsd-overlay.pc.in-Set-Cflags-to-use-I-instead.patch b/poky/meta/recipes-support/libbsd/libbsd/0001-src-libbsd-overlay.pc.in-Set-Cflags-to-use-I-instead.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libbsd/libbsd/0001-src-libbsd-overlay.pc.in-Set-Cflags-to-use-I-instead.patch
rename to poky/meta/recipes-support/libbsd/libbsd/0001-src-libbsd-overlay.pc.in-Set-Cflags-to-use-I-instead.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libbsd/libbsd/0002-Remove-funopen.patch b/poky/meta/recipes-support/libbsd/libbsd/0002-Remove-funopen.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libbsd/libbsd/0002-Remove-funopen.patch
rename to poky/meta/recipes-support/libbsd/libbsd/0002-Remove-funopen.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libbsd/libbsd_0.8.7.bb b/poky/meta/recipes-support/libbsd/libbsd_0.8.7.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libbsd/libbsd_0.8.7.bb
rename to poky/meta/recipes-support/libbsd/libbsd_0.8.7.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/libcap-ng/libcap-ng/python.patch b/poky/meta/recipes-support/libcap-ng/libcap-ng/python.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libcap-ng/libcap-ng/python.patch
rename to poky/meta/recipes-support/libcap-ng/libcap-ng/python.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libcap-ng/libcap-ng_0.7.8.bb b/poky/meta/recipes-support/libcap-ng/libcap-ng_0.7.8.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libcap-ng/libcap-ng_0.7.8.bb
rename to poky/meta/recipes-support/libcap-ng/libcap-ng_0.7.8.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/libcap/files/0001-Fix-build-with-gperf-3.1.patch b/poky/meta/recipes-support/libcap/files/0001-Fix-build-with-gperf-3.1.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libcap/files/0001-Fix-build-with-gperf-3.1.patch
rename to poky/meta/recipes-support/libcap/files/0001-Fix-build-with-gperf-3.1.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libcap/files/0001-ensure-the-XATTR_NAME_CAPS-is-defined-when-it-is-use.patch b/poky/meta/recipes-support/libcap/files/0001-ensure-the-XATTR_NAME_CAPS-is-defined-when-it-is-use.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libcap/files/0001-ensure-the-XATTR_NAME_CAPS-is-defined-when-it-is-use.patch
rename to poky/meta/recipes-support/libcap/files/0001-ensure-the-XATTR_NAME_CAPS-is-defined-when-it-is-use.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libcap/libcap_2.25.bb b/poky/meta/recipes-support/libcap/libcap_2.25.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libcap/libcap_2.25.bb
rename to poky/meta/recipes-support/libcap/libcap_2.25.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/libcheck/libcheck_0.12.0.bb b/poky/meta/recipes-support/libcheck/libcheck_0.12.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libcheck/libcheck_0.12.0.bb
rename to poky/meta/recipes-support/libcheck/libcheck_0.12.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/libcroco/libcroco_0.6.12.bb b/poky/meta/recipes-support/libcroco/libcroco_0.6.12.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libcroco/libcroco_0.6.12.bb
rename to poky/meta/recipes-support/libcroco/libcroco_0.6.12.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/libdaemon/libdaemon/fix-includes.patch b/poky/meta/recipes-support/libdaemon/libdaemon/fix-includes.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libdaemon/libdaemon/fix-includes.patch
rename to poky/meta/recipes-support/libdaemon/libdaemon/fix-includes.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libdaemon/libdaemon_0.14.bb b/poky/meta/recipes-support/libdaemon/libdaemon_0.14.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libdaemon/libdaemon_0.14.bb
rename to poky/meta/recipes-support/libdaemon/libdaemon_0.14.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/libevdev/libevdev_1.5.8.bb b/poky/meta/recipes-support/libevdev/libevdev_1.5.8.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libevdev/libevdev_1.5.8.bb
rename to poky/meta/recipes-support/libevdev/libevdev_1.5.8.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/libevent/libevent/0001-test-fix-32bit-linux-regress.patch b/poky/meta/recipes-support/libevent/libevent/0001-test-fix-32bit-linux-regress.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libevent/libevent/0001-test-fix-32bit-linux-regress.patch
rename to poky/meta/recipes-support/libevent/libevent/0001-test-fix-32bit-linux-regress.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libevent/libevent/Makefile-missing-test-dir.patch b/poky/meta/recipes-support/libevent/libevent/Makefile-missing-test-dir.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libevent/libevent/Makefile-missing-test-dir.patch
rename to poky/meta/recipes-support/libevent/libevent/Makefile-missing-test-dir.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libevent/libevent/run-ptest b/poky/meta/recipes-support/libevent/libevent/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libevent/libevent/run-ptest
rename to poky/meta/recipes-support/libevent/libevent/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-support/libevent/libevent_2.1.8.bb b/poky/meta/recipes-support/libevent/libevent_2.1.8.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libevent/libevent_2.1.8.bb
rename to poky/meta/recipes-support/libevent/libevent_2.1.8.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/libexif/libexif_0.6.21.bb b/poky/meta/recipes-support/libexif/libexif_0.6.21.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libexif/libexif_0.6.21.bb
rename to poky/meta/recipes-support/libexif/libexif_0.6.21.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32-build.patch b/poky/meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32-build.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32-build.patch
rename to poky/meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32-build.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libffi/libffi/0001-mips-Use-compiler-internal-define-for-linux.patch b/poky/meta/recipes-support/libffi/libffi/0001-mips-Use-compiler-internal-define-for-linux.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libffi/libffi/0001-mips-Use-compiler-internal-define-for-linux.patch
rename to poky/meta/recipes-support/libffi/libffi/0001-mips-Use-compiler-internal-define-for-linux.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libffi/libffi/0001-mips-fix-MIPS-softfloat-build-issue.patch b/poky/meta/recipes-support/libffi/libffi/0001-mips-fix-MIPS-softfloat-build-issue.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libffi/libffi/0001-mips-fix-MIPS-softfloat-build-issue.patch
rename to poky/meta/recipes-support/libffi/libffi/0001-mips-fix-MIPS-softfloat-build-issue.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libffi/libffi/not-win32.patch b/poky/meta/recipes-support/libffi/libffi/not-win32.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libffi/libffi/not-win32.patch
rename to poky/meta/recipes-support/libffi/libffi/not-win32.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libffi/libffi_3.2.1.bb b/poky/meta/recipes-support/libffi/libffi_3.2.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libffi/libffi_3.2.1.bb
rename to poky/meta/recipes-support/libffi/libffi_3.2.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/libfm/libfm-extra/0001-nls.m4-Take-it-from-gettext-0.15.patch b/poky/meta/recipes-support/libfm/libfm-extra/0001-nls.m4-Take-it-from-gettext-0.15.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libfm/libfm-extra/0001-nls.m4-Take-it-from-gettext-0.15.patch
rename to poky/meta/recipes-support/libfm/libfm-extra/0001-nls.m4-Take-it-from-gettext-0.15.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libfm/libfm-extra_1.2.5.bb b/poky/meta/recipes-support/libfm/libfm-extra_1.2.5.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libfm/libfm-extra_1.2.5.bb
rename to poky/meta/recipes-support/libfm/libfm-extra_1.2.5.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/libfm/libfm/0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch b/poky/meta/recipes-support/libfm/libfm/0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libfm/libfm/0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch
rename to poky/meta/recipes-support/libfm/libfm/0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libfm/libfm/0001-Enclose-text-in-programlisting-into-CDATA.patch b/poky/meta/recipes-support/libfm/libfm/0001-Enclose-text-in-programlisting-into-CDATA.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libfm/libfm/0001-Enclose-text-in-programlisting-into-CDATA.patch
rename to poky/meta/recipes-support/libfm/libfm/0001-Enclose-text-in-programlisting-into-CDATA.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libfm/libfm_1.2.5.bb b/poky/meta/recipes-support/libfm/libfm_1.2.5.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libfm/libfm_1.2.5.bb
rename to poky/meta/recipes-support/libfm/libfm_1.2.5.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/0001-Add-and-use-pkg-config-for-libgcrypt-instead-of-conf.patch b/poky/meta/recipes-support/libgcrypt/files/0001-Add-and-use-pkg-config-for-libgcrypt-instead-of-conf.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/0001-Add-and-use-pkg-config-for-libgcrypt-instead-of-conf.patch
rename to poky/meta/recipes-support/libgcrypt/files/0001-Add-and-use-pkg-config-for-libgcrypt-instead-of-conf.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch b/poky/meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch
rename to poky/meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/0003-tests-bench-slope.c-workaround-ICE-failure-on-mips-w.patch b/poky/meta/recipes-support/libgcrypt/files/0003-tests-bench-slope.c-workaround-ICE-failure-on-mips-w.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/0003-tests-bench-slope.c-workaround-ICE-failure-on-mips-w.patch
rename to poky/meta/recipes-support/libgcrypt/files/0003-tests-bench-slope.c-workaround-ICE-failure-on-mips-w.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch b/poky/meta/recipes-support/libgcrypt/files/0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libgcrypt/files/0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch
rename to poky/meta/recipes-support/libgcrypt/files/0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt_1.8.2.bb b/poky/meta/recipes-support/libgcrypt/libgcrypt_1.8.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libgcrypt/libgcrypt_1.8.2.bb
rename to poky/meta/recipes-support/libgcrypt/libgcrypt_1.8.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch b/poky/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch
rename to poky/meta/recipes-support/libgpg-error/libgpg-error/pkgconfig.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libgpg-error/libgpg-error_1.27.bb b/poky/meta/recipes-support/libgpg-error/libgpg-error_1.27.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libgpg-error/libgpg-error_1.27.bb
rename to poky/meta/recipes-support/libgpg-error/libgpg-error_1.27.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/libical/libical/0001-CMakeLists.txt-libical.pc.in-fix-iculibs-remove-full.patch b/poky/meta/recipes-support/libical/libical/0001-CMakeLists.txt-libical.pc.in-fix-iculibs-remove-full.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libical/libical/0001-CMakeLists.txt-libical.pc.in-fix-iculibs-remove-full.patch
rename to poky/meta/recipes-support/libical/libical/0001-CMakeLists.txt-libical.pc.in-fix-iculibs-remove-full.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch b/poky/meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch
rename to poky/meta/recipes-support/libical/libical/Remove-cmake-check-for-Perl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libical/libical_2.0.0.bb b/poky/meta/recipes-support/libical/libical_2.0.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libical/libical_2.0.0.bb
rename to poky/meta/recipes-support/libical/libical_2.0.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch b/poky/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch
rename to poky/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libksba/libksba_1.3.5.bb b/poky/meta/recipes-support/libksba/libksba_1.3.5.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libksba/libksba_1.3.5.bb
rename to poky/meta/recipes-support/libksba/libksba_1.3.5.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/libmpc/libmpc.inc b/poky/meta/recipes-support/libmpc/libmpc.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libmpc/libmpc.inc
rename to poky/meta/recipes-support/libmpc/libmpc.inc
diff --git a/import-layers/yocto-poky/meta/recipes-support/libmpc/libmpc_1.1.0.bb b/poky/meta/recipes-support/libmpc/libmpc_1.1.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libmpc/libmpc_1.1.0.bb
rename to poky/meta/recipes-support/libmpc/libmpc_1.1.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/libnl/libnl/0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch b/poky/meta/recipes-support/libnl/libnl/0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libnl/libnl/0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch
rename to poky/meta/recipes-support/libnl/libnl/0001-PATCH-fix-libnl-3.4.0-musl-compile-problem.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libnl/libnl/fix-pc-file.patch b/poky/meta/recipes-support/libnl/libnl/fix-pc-file.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libnl/libnl/fix-pc-file.patch
rename to poky/meta/recipes-support/libnl/libnl/fix-pc-file.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libnl/libnl_3.4.0.bb b/poky/meta/recipes-support/libnl/libnl_3.4.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libnl/libnl_3.4.0.bb
rename to poky/meta/recipes-support/libnl/libnl_3.4.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre/Makefile b/poky/meta/recipes-support/libpcre/libpcre/Makefile
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre/Makefile
rename to poky/meta/recipes-support/libpcre/libpcre/Makefile
diff --git a/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre/fix-pcre-name-collision.patch b/poky/meta/recipes-support/libpcre/libpcre/fix-pcre-name-collision.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre/fix-pcre-name-collision.patch
rename to poky/meta/recipes-support/libpcre/libpcre/fix-pcre-name-collision.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre/pcre-cross.patch b/poky/meta/recipes-support/libpcre/libpcre/pcre-cross.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre/pcre-cross.patch
rename to poky/meta/recipes-support/libpcre/libpcre/pcre-cross.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre/run-ptest b/poky/meta/recipes-support/libpcre/libpcre/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre/run-ptest
rename to poky/meta/recipes-support/libpcre/libpcre/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre2/pcre-cross.patch b/poky/meta/recipes-support/libpcre/libpcre2/pcre-cross.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre2/pcre-cross.patch
rename to poky/meta/recipes-support/libpcre/libpcre2/pcre-cross.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre2_10.30.bb b/poky/meta/recipes-support/libpcre/libpcre2_10.30.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre2_10.30.bb
rename to poky/meta/recipes-support/libpcre/libpcre2_10.30.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre_8.41.bb b/poky/meta/recipes-support/libpcre/libpcre_8.41.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libpcre/libpcre_8.41.bb
rename to poky/meta/recipes-support/libpcre/libpcre_8.41.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/libproxy/libproxy_0.4.15.bb b/poky/meta/recipes-support/libproxy/libproxy_0.4.15.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libproxy/libproxy_0.4.15.bb
rename to poky/meta/recipes-support/libproxy/libproxy_0.4.15.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/libsoup/libsoup-2.4_2.60.3.bb b/poky/meta/recipes-support/libsoup/libsoup-2.4_2.60.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libsoup/libsoup-2.4_2.60.3.bb
rename to poky/meta/recipes-support/libsoup/libsoup-2.4_2.60.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/libunistring/libunistring/0001-Unset-need_charset_alias-when-building-for-musl.patch b/poky/meta/recipes-support/libunistring/libunistring/0001-Unset-need_charset_alias-when-building-for-musl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libunistring/libunistring/0001-Unset-need_charset_alias-when-building-for-musl.patch
rename to poky/meta/recipes-support/libunistring/libunistring/0001-Unset-need_charset_alias-when-building-for-musl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch b/poky/meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch
rename to poky/meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libunistring/libunistring_0.9.9.bb b/poky/meta/recipes-support/libunistring/libunistring_0.9.9.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libunistring/libunistring_0.9.9.bb
rename to poky/meta/recipes-support/libunistring/libunistring_0.9.9.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind.inc b/poky/meta/recipes-support/libunwind/libunwind.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind.inc
rename to poky/meta/recipes-support/libunwind/libunwind.inc
diff --git a/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind/0001-Fix-build-on-mips-musl.patch b/poky/meta/recipes-support/libunwind/libunwind/0001-Fix-build-on-mips-musl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind/0001-Fix-build-on-mips-musl.patch
rename to poky/meta/recipes-support/libunwind/libunwind/0001-Fix-build-on-mips-musl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind/0001-add-knobs-to-disable-enable-tests.patch b/poky/meta/recipes-support/libunwind/libunwind/0001-add-knobs-to-disable-enable-tests.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind/0001-add-knobs-to-disable-enable-tests.patch
rename to poky/meta/recipes-support/libunwind/libunwind/0001-add-knobs-to-disable-enable-tests.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind/0001-backtrace-Use-only-with-glibc-and-uclibc.patch b/poky/meta/recipes-support/libunwind/libunwind/0001-backtrace-Use-only-with-glibc-and-uclibc.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind/0001-backtrace-Use-only-with-glibc-and-uclibc.patch
rename to poky/meta/recipes-support/libunwind/libunwind/0001-backtrace-Use-only-with-glibc-and-uclibc.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind/0001-ppc32-Consider-ucontext-mismatches-between-glibc-and.patch b/poky/meta/recipes-support/libunwind/libunwind/0001-ppc32-Consider-ucontext-mismatches-between-glibc-and.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind/0001-ppc32-Consider-ucontext-mismatches-between-glibc-and.patch
rename to poky/meta/recipes-support/libunwind/libunwind/0001-ppc32-Consider-ucontext-mismatches-between-glibc-and.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind/0001-x86-Stub-out-x86_local_resume.patch b/poky/meta/recipes-support/libunwind/libunwind/0001-x86-Stub-out-x86_local_resume.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind/0001-x86-Stub-out-x86_local_resume.patch
rename to poky/meta/recipes-support/libunwind/libunwind/0001-x86-Stub-out-x86_local_resume.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind/Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch b/poky/meta/recipes-support/libunwind/libunwind/Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind/Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch
rename to poky/meta/recipes-support/libunwind/libunwind/Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind/libunwind-1.1-x32.patch b/poky/meta/recipes-support/libunwind/libunwind/libunwind-1.1-x32.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind/libunwind-1.1-x32.patch
rename to poky/meta/recipes-support/libunwind/libunwind/libunwind-1.1-x32.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch b/poky/meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch
rename to poky/meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind_1.2.1.bb b/poky/meta/recipes-support/libunwind/libunwind_1.2.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libunwind/libunwind_1.2.1.bb
rename to poky/meta/recipes-support/libunwind/libunwind_1.2.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/liburcu/liburcu_0.10.1.bb b/poky/meta/recipes-support/liburcu/liburcu_0.10.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/liburcu/liburcu_0.10.1.bb
rename to poky/meta/recipes-support/liburcu/liburcu_0.10.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch b/poky/meta/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch
rename to poky/meta/recipes-support/libusb/libusb-compat/0001-usb.h-Include-sys-types.h.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libusb/libusb-compat_0.1.5.bb b/poky/meta/recipes-support/libusb/libusb-compat_0.1.5.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libusb/libusb-compat_0.1.5.bb
rename to poky/meta/recipes-support/libusb/libusb-compat_0.1.5.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/libusb/libusb1/no-dll.patch b/poky/meta/recipes-support/libusb/libusb1/no-dll.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libusb/libusb1/no-dll.patch
rename to poky/meta/recipes-support/libusb/libusb1/no-dll.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/libusb/libusb1_1.0.21.bb b/poky/meta/recipes-support/libusb/libusb1_1.0.21.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libusb/libusb1_1.0.21.bb
rename to poky/meta/recipes-support/libusb/libusb1_1.0.21.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/libxslt/libxslt_1.1.32.bb b/poky/meta/recipes-support/libxslt/libxslt_1.1.32.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libxslt/libxslt_1.1.32.bb
rename to poky/meta/recipes-support/libxslt/libxslt_1.1.32.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/libyaml/libyaml_0.1.7.bb b/poky/meta/recipes-support/libyaml/libyaml_0.1.7.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/libyaml/libyaml_0.1.7.bb
rename to poky/meta/recipes-support/libyaml/libyaml_0.1.7.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/lz4/files/0001-tests-Makefile-don-t-use-LIBDIR-as-variable.patch b/poky/meta/recipes-support/lz4/files/0001-tests-Makefile-don-t-use-LIBDIR-as-variable.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/lz4/files/0001-tests-Makefile-don-t-use-LIBDIR-as-variable.patch
rename to poky/meta/recipes-support/lz4/files/0001-tests-Makefile-don-t-use-LIBDIR-as-variable.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/lz4/files/run-ptest b/poky/meta/recipes-support/lz4/files/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/lz4/files/run-ptest
rename to poky/meta/recipes-support/lz4/files/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-support/lz4/lz4_1.7.4.bb b/poky/meta/recipes-support/lz4/lz4_1.7.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/lz4/lz4_1.7.4.bb
rename to poky/meta/recipes-support/lz4/lz4_1.7.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/lzo/lzo/0001-Add-pkgconfigdir-to-solve-the-undefine-error.patch b/poky/meta/recipes-support/lzo/lzo/0001-Add-pkgconfigdir-to-solve-the-undefine-error.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/lzo/lzo/0001-Add-pkgconfigdir-to-solve-the-undefine-error.patch
rename to poky/meta/recipes-support/lzo/lzo/0001-Add-pkgconfigdir-to-solve-the-undefine-error.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/lzo/lzo/0001-Use-memcpy-instead-of-reinventing-it.patch b/poky/meta/recipes-support/lzo/lzo/0001-Use-memcpy-instead-of-reinventing-it.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/lzo/lzo/0001-Use-memcpy-instead-of-reinventing-it.patch
rename to poky/meta/recipes-support/lzo/lzo/0001-Use-memcpy-instead-of-reinventing-it.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/lzo/lzo/run-ptest b/poky/meta/recipes-support/lzo/lzo/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/lzo/lzo/run-ptest
rename to poky/meta/recipes-support/lzo/lzo/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-support/lzo/lzo_2.10.bb b/poky/meta/recipes-support/lzo/lzo_2.10.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/lzo/lzo_2.10.bb
rename to poky/meta/recipes-support/lzo/lzo_2.10.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/lzop/lzop/0001-use-static-inlines-as-the-external-inline-definition.patch b/poky/meta/recipes-support/lzop/lzop/0001-use-static-inlines-as-the-external-inline-definition.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/lzop/lzop/0001-use-static-inlines-as-the-external-inline-definition.patch
rename to poky/meta/recipes-support/lzop/lzop/0001-use-static-inlines-as-the-external-inline-definition.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/lzop/lzop/acinclude.m4 b/poky/meta/recipes-support/lzop/lzop/acinclude.m4
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/lzop/lzop/acinclude.m4
rename to poky/meta/recipes-support/lzop/lzop/acinclude.m4
diff --git a/import-layers/yocto-poky/meta/recipes-support/lzop/lzop/lzop-1.03-gcc6.patch b/poky/meta/recipes-support/lzop/lzop/lzop-1.03-gcc6.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/lzop/lzop/lzop-1.03-gcc6.patch
rename to poky/meta/recipes-support/lzop/lzop/lzop-1.03-gcc6.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/lzop/lzop/x32_abi_miniacc_h.patch b/poky/meta/recipes-support/lzop/lzop/x32_abi_miniacc_h.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/lzop/lzop/x32_abi_miniacc_h.patch
rename to poky/meta/recipes-support/lzop/lzop/x32_abi_miniacc_h.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/lzop/lzop_1.03.bb b/poky/meta/recipes-support/lzop/lzop_1.03.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/lzop/lzop_1.03.bb
rename to poky/meta/recipes-support/lzop/lzop_1.03.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/mpfr/mpfr/long-long-thumb.patch b/poky/meta/recipes-support/mpfr/mpfr/long-long-thumb.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/mpfr/mpfr/long-long-thumb.patch
rename to poky/meta/recipes-support/mpfr/mpfr/long-long-thumb.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/mpfr/mpfr_3.1.5.bb b/poky/meta/recipes-support/mpfr/mpfr_3.1.5.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/mpfr/mpfr_3.1.5.bb
rename to poky/meta/recipes-support/mpfr/mpfr_3.1.5.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/nettle/nettle-3.4/Add-target-to-only-build-tests-not-run-them.patch b/poky/meta/recipes-support/nettle/nettle-3.4/Add-target-to-only-build-tests-not-run-them.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/nettle/nettle-3.4/Add-target-to-only-build-tests-not-run-them.patch
rename to poky/meta/recipes-support/nettle/nettle-3.4/Add-target-to-only-build-tests-not-run-them.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/nettle/nettle-3.4/check-header-files-of-openssl-only-if-enable_.patch b/poky/meta/recipes-support/nettle/nettle-3.4/check-header-files-of-openssl-only-if-enable_.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/nettle/nettle-3.4/check-header-files-of-openssl-only-if-enable_.patch
rename to poky/meta/recipes-support/nettle/nettle-3.4/check-header-files-of-openssl-only-if-enable_.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/nettle/nettle-3.4/dlopen-test.patch b/poky/meta/recipes-support/nettle/nettle-3.4/dlopen-test.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/nettle/nettle-3.4/dlopen-test.patch
rename to poky/meta/recipes-support/nettle/nettle-3.4/dlopen-test.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/nettle/nettle-3.4/run-ptest b/poky/meta/recipes-support/nettle/nettle-3.4/run-ptest
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/nettle/nettle-3.4/run-ptest
rename to poky/meta/recipes-support/nettle/nettle-3.4/run-ptest
diff --git a/import-layers/yocto-poky/meta/recipes-support/nettle/nettle_3.4.bb b/poky/meta/recipes-support/nettle/nettle_3.4.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/nettle/nettle_3.4.bb
rename to poky/meta/recipes-support/nettle/nettle_3.4.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/npth/npth/pkgconfig.patch b/poky/meta/recipes-support/npth/npth/pkgconfig.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/npth/npth/pkgconfig.patch
rename to poky/meta/recipes-support/npth/npth/pkgconfig.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/npth/npth_1.5.bb b/poky/meta/recipes-support/npth/npth_1.5.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/npth/npth_1.5.bb
rename to poky/meta/recipes-support/npth/npth_1.5.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch b/poky/meta/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch
rename to poky/meta/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch b/poky/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch
rename to poky/meta/recipes-support/nspr/nspr/0002-Add-nios2-support.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch b/poky/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch
rename to poky/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/nspr/nspr/nspr.pc.in b/poky/meta/recipes-support/nspr/nspr/nspr.pc.in
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/nspr/nspr/nspr.pc.in
rename to poky/meta/recipes-support/nspr/nspr/nspr.pc.in
diff --git a/import-layers/yocto-poky/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch b/poky/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch
rename to poky/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch b/poky/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch
rename to poky/meta/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/nspr/nspr_4.19.bb b/poky/meta/recipes-support/nspr/nspr_4.19.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/nspr/nspr_4.19.bb
rename to poky/meta/recipes-support/nspr/nspr_4.19.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/nss-myhostname/nss-myhostname/0001-nss-myhostname-Check-for-nss.h-presense-before-use.patch b/poky/meta/recipes-support/nss-myhostname/nss-myhostname/0001-nss-myhostname-Check-for-nss.h-presense-before-use.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/nss-myhostname/nss-myhostname/0001-nss-myhostname-Check-for-nss.h-presense-before-use.patch
rename to poky/meta/recipes-support/nss-myhostname/nss-myhostname/0001-nss-myhostname-Check-for-nss.h-presense-before-use.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb b/poky/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb
rename to poky/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/nss/nss/0001-Bug-1437734-Use-snprintf-in-sign.c-r-ttaubert.patch b/poky/meta/recipes-support/nss/nss/0001-Bug-1437734-Use-snprintf-in-sign.c-r-ttaubert.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/nss/nss/0001-Bug-1437734-Use-snprintf-in-sign.c-r-ttaubert.patch
rename to poky/meta/recipes-support/nss/nss/0001-Bug-1437734-Use-snprintf-in-sign.c-r-ttaubert.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch b/poky/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch
rename to poky/meta/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/nss/nss/Fix-compilation-for-X32.patch b/poky/meta/recipes-support/nss/nss/Fix-compilation-for-X32.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/nss/nss/Fix-compilation-for-X32.patch
rename to poky/meta/recipes-support/nss/nss/Fix-compilation-for-X32.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch b/poky/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch
rename to poky/meta/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/nss/nss/nss-build-hacl-poly1305-aarch64.patch b/poky/meta/recipes-support/nss/nss/nss-build-hacl-poly1305-aarch64.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/nss/nss/nss-build-hacl-poly1305-aarch64.patch
rename to poky/meta/recipes-support/nss/nss/nss-build-hacl-poly1305-aarch64.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch b/poky/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch
rename to poky/meta/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch b/poky/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch
rename to poky/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch b/poky/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch
rename to poky/meta/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/nss/nss/nss.pc.in b/poky/meta/recipes-support/nss/nss/nss.pc.in
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/nss/nss/nss.pc.in
rename to poky/meta/recipes-support/nss/nss/nss.pc.in
diff --git a/import-layers/yocto-poky/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch b/poky/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch
rename to poky/meta/recipes-support/nss/nss/pqg.c-ULL_addend.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/nss/nss/signlibs.sh b/poky/meta/recipes-support/nss/nss/signlibs.sh
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/nss/nss/signlibs.sh
rename to poky/meta/recipes-support/nss/nss/signlibs.sh
diff --git a/import-layers/yocto-poky/meta/recipes-support/nss/nss_3.35.bb b/poky/meta/recipes-support/nss/nss_3.35.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/nss/nss_3.35.bb
rename to poky/meta/recipes-support/nss/nss_3.35.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/p11-kit/p11-kit/0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch b/poky/meta/recipes-support/p11-kit/p11-kit/0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/p11-kit/p11-kit/0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch
rename to poky/meta/recipes-support/p11-kit/p11-kit/0001-LINGUAS-drop-the-languages-for-which-upstream-does-n.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/p11-kit/p11-kit_0.22.1.bb b/poky/meta/recipes-support/p11-kit/p11-kit_0.22.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/p11-kit/p11-kit_0.22.1.bb
rename to poky/meta/recipes-support/p11-kit/p11-kit_0.22.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/pinentry/pinentry-1.1.0/gpg-error_pkconf.patch b/poky/meta/recipes-support/pinentry/pinentry-1.1.0/gpg-error_pkconf.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/pinentry/pinentry-1.1.0/gpg-error_pkconf.patch
rename to poky/meta/recipes-support/pinentry/pinentry-1.1.0/gpg-error_pkconf.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/pinentry/pinentry-1.1.0/libassuan_pkgconf.patch b/poky/meta/recipes-support/pinentry/pinentry-1.1.0/libassuan_pkgconf.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/pinentry/pinentry-1.1.0/libassuan_pkgconf.patch
rename to poky/meta/recipes-support/pinentry/pinentry-1.1.0/libassuan_pkgconf.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/pinentry/pinentry_1.1.0.bb b/poky/meta/recipes-support/pinentry/pinentry_1.1.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/pinentry/pinentry_1.1.0.bb
rename to poky/meta/recipes-support/pinentry/pinentry_1.1.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/popt/popt/disable_tests.patch b/poky/meta/recipes-support/popt/popt/disable_tests.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/popt/popt/disable_tests.patch
rename to poky/meta/recipes-support/popt/popt/disable_tests.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/popt/popt/pkgconfig_fix.patch b/poky/meta/recipes-support/popt/popt/pkgconfig_fix.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/popt/popt/pkgconfig_fix.patch
rename to poky/meta/recipes-support/popt/popt/pkgconfig_fix.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/popt/popt/popt_fix_for_automake-1.12.patch b/poky/meta/recipes-support/popt/popt/popt_fix_for_automake-1.12.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/popt/popt/popt_fix_for_automake-1.12.patch
rename to poky/meta/recipes-support/popt/popt/popt_fix_for_automake-1.12.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/popt/popt_1.16.bb b/poky/meta/recipes-support/popt/popt_1.16.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/popt/popt_1.16.bb
rename to poky/meta/recipes-support/popt/popt_1.16.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/ptest-runner/ptest-runner_2.1.1.bb b/poky/meta/recipes-support/ptest-runner/ptest-runner_2.1.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/ptest-runner/ptest-runner_2.1.1.bb
rename to poky/meta/recipes-support/ptest-runner/ptest-runner_2.1.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/re2c/re2c/mkdir.patch b/poky/meta/recipes-support/re2c/re2c/mkdir.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/re2c/re2c/mkdir.patch
rename to poky/meta/recipes-support/re2c/re2c/mkdir.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/re2c/re2c_0.16.bb b/poky/meta/recipes-support/re2c/re2c_0.16.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/re2c/re2c_0.16.bb
rename to poky/meta/recipes-support/re2c/re2c_0.16.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools/0001-If-the-libc-is-lacking-argp-use-libargp.patch b/poky/meta/recipes-support/rng-tools/rng-tools/0001-If-the-libc-is-lacking-argp-use-libargp.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools/0001-If-the-libc-is-lacking-argp-use-libargp.patch
rename to poky/meta/recipes-support/rng-tools/rng-tools/0001-If-the-libc-is-lacking-argp-use-libargp.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools/0002-Add-argument-to-control-the-libargp-dependency.patch b/poky/meta/recipes-support/rng-tools/rng-tools/0002-Add-argument-to-control-the-libargp-dependency.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools/0002-Add-argument-to-control-the-libargp-dependency.patch
rename to poky/meta/recipes-support/rng-tools/rng-tools/0002-Add-argument-to-control-the-libargp-dependency.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools/default b/poky/meta/recipes-support/rng-tools/rng-tools/default
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools/default
rename to poky/meta/recipes-support/rng-tools/rng-tools/default
diff --git a/import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools/init b/poky/meta/recipes-support/rng-tools/rng-tools/init
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools/init
rename to poky/meta/recipes-support/rng-tools/rng-tools/init
diff --git a/import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools/read_error_msg.patch b/poky/meta/recipes-support/rng-tools/rng-tools/read_error_msg.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools/read_error_msg.patch
rename to poky/meta/recipes-support/rng-tools/rng-tools/read_error_msg.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools/rng-tools-5-fix-textrels-on-PIC-x86.patch b/poky/meta/recipes-support/rng-tools/rng-tools/rng-tools-5-fix-textrels-on-PIC-x86.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools/rng-tools-5-fix-textrels-on-PIC-x86.patch
rename to poky/meta/recipes-support/rng-tools/rng-tools/rng-tools-5-fix-textrels-on-PIC-x86.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools/rngd.service b/poky/meta/recipes-support/rng-tools/rng-tools/rngd.service
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools/rngd.service
rename to poky/meta/recipes-support/rng-tools/rng-tools/rngd.service
diff --git a/import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools/underquote.patch b/poky/meta/recipes-support/rng-tools/rng-tools/underquote.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools/underquote.patch
rename to poky/meta/recipes-support/rng-tools/rng-tools/underquote.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools_5.bb b/poky/meta/recipes-support/rng-tools/rng-tools_5.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/rng-tools/rng-tools_5.bb
rename to poky/meta/recipes-support/rng-tools/rng-tools_5.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/serf/serf/env.patch b/poky/meta/recipes-support/serf/serf/env.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/serf/serf/env.patch
rename to poky/meta/recipes-support/serf/serf/env.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/serf/serf/norpath.patch b/poky/meta/recipes-support/serf/serf/norpath.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/serf/serf/norpath.patch
rename to poky/meta/recipes-support/serf/serf/norpath.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/serf/serf_1.3.9.bb b/poky/meta/recipes-support/serf/serf_1.3.9.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/serf/serf_1.3.9.bb
rename to poky/meta/recipes-support/serf/serf_1.3.9.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info.inc b/poky/meta/recipes-support/shared-mime-info/shared-mime-info.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info.inc
rename to poky/meta/recipes-support/shared-mime-info/shared-mime-info.inc
diff --git a/import-layers/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch b/poky/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch
rename to poky/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch b/poky/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch
rename to poky/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info_1.9.bb b/poky/meta/recipes-support/shared-mime-info/shared-mime-info_1.9.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/shared-mime-info/shared-mime-info_1.9.bb
rename to poky/meta/recipes-support/shared-mime-info/shared-mime-info_1.9.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/source-highlight/files/0001-source-highlight.pc.in-do-not-add-Boost-s-libraries-.patch b/poky/meta/recipes-support/source-highlight/files/0001-source-highlight.pc.in-do-not-add-Boost-s-libraries-.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/source-highlight/files/0001-source-highlight.pc.in-do-not-add-Boost-s-libraries-.patch
rename to poky/meta/recipes-support/source-highlight/files/0001-source-highlight.pc.in-do-not-add-Boost-s-libraries-.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/source-highlight/source-highlight_3.1.8.bb b/poky/meta/recipes-support/source-highlight/source-highlight_3.1.8.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/source-highlight/source-highlight_3.1.8.bb
rename to poky/meta/recipes-support/source-highlight/source-highlight_3.1.8.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/sqlite/sqlite3.inc b/poky/meta/recipes-support/sqlite/sqlite3.inc
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/sqlite/sqlite3.inc
rename to poky/meta/recipes-support/sqlite/sqlite3.inc
diff --git a/import-layers/yocto-poky/meta/recipes-support/sqlite/sqlite3_3.22.0.bb b/poky/meta/recipes-support/sqlite/sqlite3_3.22.0.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/sqlite/sqlite3_3.22.0.bb
rename to poky/meta/recipes-support/sqlite/sqlite3_3.22.0.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/taglib/taglib/CVE-2017-12678.patch b/poky/meta/recipes-support/taglib/taglib/CVE-2017-12678.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/taglib/taglib/CVE-2017-12678.patch
rename to poky/meta/recipes-support/taglib/taglib/CVE-2017-12678.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/taglib/taglib_1.11.1.bb b/poky/meta/recipes-support/taglib/taglib_1.11.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/taglib/taglib_1.11.1.bb
rename to poky/meta/recipes-support/taglib/taglib_1.11.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/user-creation/files/system-xuser.conf b/poky/meta/recipes-support/user-creation/files/system-xuser.conf
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/user-creation/files/system-xuser.conf
rename to poky/meta/recipes-support/user-creation/files/system-xuser.conf
diff --git a/import-layers/yocto-poky/meta/recipes-support/user-creation/xuser-account_0.1.bb b/poky/meta/recipes-support/user-creation/xuser-account_0.1.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/user-creation/xuser-account_0.1.bb
rename to poky/meta/recipes-support/user-creation/xuser-account_0.1.bb
diff --git a/import-layers/yocto-poky/meta/recipes-support/vte/vte/0001-Add-m4-vapigen.m4.patch b/poky/meta/recipes-support/vte/vte/0001-Add-m4-vapigen.m4.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/vte/vte/0001-Add-m4-vapigen.m4.patch
rename to poky/meta/recipes-support/vte/vte/0001-Add-m4-vapigen.m4.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/vte/vte/0001-Don-t-enable-stack-protection-by-default.patch b/poky/meta/recipes-support/vte/vte/0001-Don-t-enable-stack-protection-by-default.patch
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/vte/vte/0001-Don-t-enable-stack-protection-by-default.patch
rename to poky/meta/recipes-support/vte/vte/0001-Don-t-enable-stack-protection-by-default.patch
diff --git a/import-layers/yocto-poky/meta/recipes-support/vte/vte_0.50.2.bb b/poky/meta/recipes-support/vte/vte_0.50.2.bb
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes-support/vte/vte_0.50.2.bb
rename to poky/meta/recipes-support/vte/vte_0.50.2.bb
diff --git a/import-layers/yocto-poky/meta/recipes.txt b/poky/meta/recipes.txt
similarity index 100%
rename from import-layers/yocto-poky/meta/recipes.txt
rename to poky/meta/recipes.txt
diff --git a/import-layers/yocto-poky/meta/site/arm-32 b/poky/meta/site/arm-32
similarity index 100%
rename from import-layers/yocto-poky/meta/site/arm-32
rename to poky/meta/site/arm-32
diff --git a/import-layers/yocto-poky/meta/site/arm-64 b/poky/meta/site/arm-64
similarity index 100%
rename from import-layers/yocto-poky/meta/site/arm-64
rename to poky/meta/site/arm-64
diff --git a/import-layers/yocto-poky/meta/site/arm-common b/poky/meta/site/arm-common
similarity index 100%
rename from import-layers/yocto-poky/meta/site/arm-common
rename to poky/meta/site/arm-common
diff --git a/import-layers/yocto-poky/meta/site/arm-darwin b/poky/meta/site/arm-darwin
similarity index 100%
rename from import-layers/yocto-poky/meta/site/arm-darwin
rename to poky/meta/site/arm-darwin
diff --git a/import-layers/yocto-poky/meta/site/arm-darwin8 b/poky/meta/site/arm-darwin8
similarity index 100%
rename from import-layers/yocto-poky/meta/site/arm-darwin8
rename to poky/meta/site/arm-darwin8
diff --git a/import-layers/yocto-poky/meta/site/arm-linux b/poky/meta/site/arm-linux
similarity index 100%
rename from import-layers/yocto-poky/meta/site/arm-linux
rename to poky/meta/site/arm-linux
diff --git a/import-layers/yocto-poky/meta/site/armeb-linux b/poky/meta/site/armeb-linux
similarity index 100%
rename from import-layers/yocto-poky/meta/site/armeb-linux
rename to poky/meta/site/armeb-linux
diff --git a/import-layers/yocto-poky/meta/site/common b/poky/meta/site/common
similarity index 100%
rename from import-layers/yocto-poky/meta/site/common
rename to poky/meta/site/common
diff --git a/import-layers/yocto-poky/meta/site/common-darwin b/poky/meta/site/common-darwin
similarity index 100%
rename from import-layers/yocto-poky/meta/site/common-darwin
rename to poky/meta/site/common-darwin
diff --git a/import-layers/yocto-poky/meta/site/common-glibc b/poky/meta/site/common-glibc
similarity index 100%
rename from import-layers/yocto-poky/meta/site/common-glibc
rename to poky/meta/site/common-glibc
diff --git a/import-layers/yocto-poky/meta/site/common-linux b/poky/meta/site/common-linux
similarity index 100%
rename from import-layers/yocto-poky/meta/site/common-linux
rename to poky/meta/site/common-linux
diff --git a/import-layers/yocto-poky/meta/site/common-mingw b/poky/meta/site/common-mingw
similarity index 100%
rename from import-layers/yocto-poky/meta/site/common-mingw
rename to poky/meta/site/common-mingw
diff --git a/import-layers/yocto-poky/meta/site/common-musl b/poky/meta/site/common-musl
similarity index 100%
rename from import-layers/yocto-poky/meta/site/common-musl
rename to poky/meta/site/common-musl
diff --git a/import-layers/yocto-poky/meta/site/endian-big b/poky/meta/site/endian-big
similarity index 100%
rename from import-layers/yocto-poky/meta/site/endian-big
rename to poky/meta/site/endian-big
diff --git a/import-layers/yocto-poky/meta/site/endian-little b/poky/meta/site/endian-little
similarity index 100%
rename from import-layers/yocto-poky/meta/site/endian-little
rename to poky/meta/site/endian-little
diff --git a/import-layers/yocto-poky/meta/site/ix86-common b/poky/meta/site/ix86-common
similarity index 100%
rename from import-layers/yocto-poky/meta/site/ix86-common
rename to poky/meta/site/ix86-common
diff --git a/import-layers/yocto-poky/meta/site/microblaze-linux b/poky/meta/site/microblaze-linux
similarity index 100%
rename from import-layers/yocto-poky/meta/site/microblaze-linux
rename to poky/meta/site/microblaze-linux
diff --git a/import-layers/yocto-poky/meta/site/mips-common b/poky/meta/site/mips-common
similarity index 100%
rename from import-layers/yocto-poky/meta/site/mips-common
rename to poky/meta/site/mips-common
diff --git a/import-layers/yocto-poky/meta/site/mips-linux b/poky/meta/site/mips-linux
similarity index 100%
rename from import-layers/yocto-poky/meta/site/mips-linux
rename to poky/meta/site/mips-linux
diff --git a/import-layers/yocto-poky/meta/site/mips64-linux b/poky/meta/site/mips64-linux
similarity index 100%
rename from import-layers/yocto-poky/meta/site/mips64-linux
rename to poky/meta/site/mips64-linux
diff --git a/import-layers/yocto-poky/meta/site/mips64el-linux b/poky/meta/site/mips64el-linux
similarity index 100%
rename from import-layers/yocto-poky/meta/site/mips64el-linux
rename to poky/meta/site/mips64el-linux
diff --git a/import-layers/yocto-poky/meta/site/mipsel-linux b/poky/meta/site/mipsel-linux
similarity index 100%
rename from import-layers/yocto-poky/meta/site/mipsel-linux
rename to poky/meta/site/mipsel-linux
diff --git a/import-layers/yocto-poky/meta/site/mipsisa32r6-linux b/poky/meta/site/mipsisa32r6-linux
similarity index 100%
rename from import-layers/yocto-poky/meta/site/mipsisa32r6-linux
rename to poky/meta/site/mipsisa32r6-linux
diff --git a/import-layers/yocto-poky/meta/site/mipsisa32r6el-linux b/poky/meta/site/mipsisa32r6el-linux
similarity index 100%
rename from import-layers/yocto-poky/meta/site/mipsisa32r6el-linux
rename to poky/meta/site/mipsisa32r6el-linux
diff --git a/import-layers/yocto-poky/meta/site/mipsisa64r6-linux b/poky/meta/site/mipsisa64r6-linux
similarity index 100%
rename from import-layers/yocto-poky/meta/site/mipsisa64r6-linux
rename to poky/meta/site/mipsisa64r6-linux
diff --git a/import-layers/yocto-poky/meta/site/mipsisa64r6el-linux b/poky/meta/site/mipsisa64r6el-linux
similarity index 100%
rename from import-layers/yocto-poky/meta/site/mipsisa64r6el-linux
rename to poky/meta/site/mipsisa64r6el-linux
diff --git a/import-layers/yocto-poky/meta/site/native b/poky/meta/site/native
similarity index 100%
rename from import-layers/yocto-poky/meta/site/native
rename to poky/meta/site/native
diff --git a/import-layers/yocto-poky/meta/site/nios2-linux b/poky/meta/site/nios2-linux
similarity index 100%
rename from import-layers/yocto-poky/meta/site/nios2-linux
rename to poky/meta/site/nios2-linux
diff --git a/import-layers/yocto-poky/meta/site/powerpc-common b/poky/meta/site/powerpc-common
similarity index 100%
rename from import-layers/yocto-poky/meta/site/powerpc-common
rename to poky/meta/site/powerpc-common
diff --git a/import-layers/yocto-poky/meta/site/powerpc-darwin b/poky/meta/site/powerpc-darwin
similarity index 100%
rename from import-layers/yocto-poky/meta/site/powerpc-darwin
rename to poky/meta/site/powerpc-darwin
diff --git a/import-layers/yocto-poky/meta/site/powerpc-linux b/poky/meta/site/powerpc-linux
similarity index 100%
rename from import-layers/yocto-poky/meta/site/powerpc-linux
rename to poky/meta/site/powerpc-linux
diff --git a/import-layers/yocto-poky/meta/site/powerpc32-linux b/poky/meta/site/powerpc32-linux
similarity index 100%
rename from import-layers/yocto-poky/meta/site/powerpc32-linux
rename to poky/meta/site/powerpc32-linux
diff --git a/import-layers/yocto-poky/meta/site/powerpc64-linux b/poky/meta/site/powerpc64-linux
similarity index 100%
rename from import-layers/yocto-poky/meta/site/powerpc64-linux
rename to poky/meta/site/powerpc64-linux
diff --git a/import-layers/yocto-poky/meta/site/riscv32-linux b/poky/meta/site/riscv32-linux
similarity index 100%
rename from import-layers/yocto-poky/meta/site/riscv32-linux
rename to poky/meta/site/riscv32-linux
diff --git a/import-layers/yocto-poky/meta/site/riscv64-linux b/poky/meta/site/riscv64-linux
similarity index 100%
rename from import-layers/yocto-poky/meta/site/riscv64-linux
rename to poky/meta/site/riscv64-linux
diff --git a/import-layers/yocto-poky/meta/site/sh-common b/poky/meta/site/sh-common
similarity index 100%
rename from import-layers/yocto-poky/meta/site/sh-common
rename to poky/meta/site/sh-common
diff --git a/import-layers/yocto-poky/meta/site/sparc-linux b/poky/meta/site/sparc-linux
similarity index 100%
rename from import-layers/yocto-poky/meta/site/sparc-linux
rename to poky/meta/site/sparc-linux
diff --git a/import-layers/yocto-poky/meta/site/x32-linux b/poky/meta/site/x32-linux
similarity index 100%
rename from import-layers/yocto-poky/meta/site/x32-linux
rename to poky/meta/site/x32-linux
diff --git a/import-layers/yocto-poky/meta/site/x86_64-linux b/poky/meta/site/x86_64-linux
similarity index 100%
rename from import-layers/yocto-poky/meta/site/x86_64-linux
rename to poky/meta/site/x86_64-linux
diff --git a/import-layers/yocto-poky/oe-init-build-env b/poky/oe-init-build-env
similarity index 100%
rename from import-layers/yocto-poky/oe-init-build-env
rename to poky/oe-init-build-env
diff --git a/import-layers/yocto-poky/scripts/README b/poky/scripts/README
similarity index 100%
rename from import-layers/yocto-poky/scripts/README
rename to poky/scripts/README
diff --git a/import-layers/yocto-poky/scripts/bitbake-prserv-tool b/poky/scripts/bitbake-prserv-tool
similarity index 100%
rename from import-layers/yocto-poky/scripts/bitbake-prserv-tool
rename to poky/scripts/bitbake-prserv-tool
diff --git a/import-layers/yocto-poky/scripts/bitbake-whatchanged b/poky/scripts/bitbake-whatchanged
similarity index 100%
rename from import-layers/yocto-poky/scripts/bitbake-whatchanged
rename to poky/scripts/bitbake-whatchanged
diff --git a/import-layers/yocto-poky/scripts/buildhistory-collect-srcrevs b/poky/scripts/buildhistory-collect-srcrevs
similarity index 100%
rename from import-layers/yocto-poky/scripts/buildhistory-collect-srcrevs
rename to poky/scripts/buildhistory-collect-srcrevs
diff --git a/import-layers/yocto-poky/scripts/buildhistory-diff b/poky/scripts/buildhistory-diff
similarity index 100%
rename from import-layers/yocto-poky/scripts/buildhistory-diff
rename to poky/scripts/buildhistory-diff
diff --git a/import-layers/yocto-poky/scripts/buildstats-diff b/poky/scripts/buildstats-diff
similarity index 100%
rename from import-layers/yocto-poky/scripts/buildstats-diff
rename to poky/scripts/buildstats-diff
diff --git a/import-layers/yocto-poky/scripts/combo-layer b/poky/scripts/combo-layer
similarity index 100%
rename from import-layers/yocto-poky/scripts/combo-layer
rename to poky/scripts/combo-layer
diff --git a/import-layers/yocto-poky/scripts/combo-layer-hook-default.sh b/poky/scripts/combo-layer-hook-default.sh
similarity index 100%
rename from import-layers/yocto-poky/scripts/combo-layer-hook-default.sh
rename to poky/scripts/combo-layer-hook-default.sh
diff --git a/import-layers/yocto-poky/scripts/combo-layer.conf.example b/poky/scripts/combo-layer.conf.example
similarity index 100%
rename from import-layers/yocto-poky/scripts/combo-layer.conf.example
rename to poky/scripts/combo-layer.conf.example
diff --git a/import-layers/yocto-poky/scripts/contrib/bb-perf/bb-matrix-plot.sh b/poky/scripts/contrib/bb-perf/bb-matrix-plot.sh
similarity index 100%
rename from import-layers/yocto-poky/scripts/contrib/bb-perf/bb-matrix-plot.sh
rename to poky/scripts/contrib/bb-perf/bb-matrix-plot.sh
diff --git a/import-layers/yocto-poky/scripts/contrib/bb-perf/bb-matrix.sh b/poky/scripts/contrib/bb-perf/bb-matrix.sh
similarity index 100%
rename from import-layers/yocto-poky/scripts/contrib/bb-perf/bb-matrix.sh
rename to poky/scripts/contrib/bb-perf/bb-matrix.sh
diff --git a/import-layers/yocto-poky/scripts/contrib/bb-perf/buildstats-plot.sh b/poky/scripts/contrib/bb-perf/buildstats-plot.sh
similarity index 100%
rename from import-layers/yocto-poky/scripts/contrib/bb-perf/buildstats-plot.sh
rename to poky/scripts/contrib/bb-perf/buildstats-plot.sh
diff --git a/import-layers/yocto-poky/scripts/contrib/bb-perf/buildstats.sh b/poky/scripts/contrib/bb-perf/buildstats.sh
similarity index 100%
rename from import-layers/yocto-poky/scripts/contrib/bb-perf/buildstats.sh
rename to poky/scripts/contrib/bb-perf/buildstats.sh
diff --git a/import-layers/yocto-poky/scripts/contrib/bbvars.py b/poky/scripts/contrib/bbvars.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/contrib/bbvars.py
rename to poky/scripts/contrib/bbvars.py
diff --git a/import-layers/yocto-poky/scripts/contrib/build-perf-test-wrapper.sh b/poky/scripts/contrib/build-perf-test-wrapper.sh
similarity index 100%
rename from import-layers/yocto-poky/scripts/contrib/build-perf-test-wrapper.sh
rename to poky/scripts/contrib/build-perf-test-wrapper.sh
diff --git a/import-layers/yocto-poky/scripts/contrib/build-perf-test.sh b/poky/scripts/contrib/build-perf-test.sh
similarity index 100%
rename from import-layers/yocto-poky/scripts/contrib/build-perf-test.sh
rename to poky/scripts/contrib/build-perf-test.sh
diff --git a/import-layers/yocto-poky/scripts/contrib/ddimage b/poky/scripts/contrib/ddimage
similarity index 100%
rename from import-layers/yocto-poky/scripts/contrib/ddimage
rename to poky/scripts/contrib/ddimage
diff --git a/import-layers/yocto-poky/scripts/contrib/devtool-stress.py b/poky/scripts/contrib/devtool-stress.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/contrib/devtool-stress.py
rename to poky/scripts/contrib/devtool-stress.py
diff --git a/import-layers/yocto-poky/scripts/contrib/dialog-power-control b/poky/scripts/contrib/dialog-power-control
similarity index 100%
rename from import-layers/yocto-poky/scripts/contrib/dialog-power-control
rename to poky/scripts/contrib/dialog-power-control
diff --git a/import-layers/yocto-poky/scripts/contrib/documentation-audit.sh b/poky/scripts/contrib/documentation-audit.sh
similarity index 100%
rename from import-layers/yocto-poky/scripts/contrib/documentation-audit.sh
rename to poky/scripts/contrib/documentation-audit.sh
diff --git a/import-layers/yocto-poky/scripts/contrib/graph-tool b/poky/scripts/contrib/graph-tool
similarity index 100%
rename from import-layers/yocto-poky/scripts/contrib/graph-tool
rename to poky/scripts/contrib/graph-tool
diff --git a/import-layers/yocto-poky/scripts/contrib/list-packageconfig-flags.py b/poky/scripts/contrib/list-packageconfig-flags.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/contrib/list-packageconfig-flags.py
rename to poky/scripts/contrib/list-packageconfig-flags.py
diff --git a/import-layers/yocto-poky/scripts/contrib/mkefidisk.sh b/poky/scripts/contrib/mkefidisk.sh
similarity index 100%
rename from import-layers/yocto-poky/scripts/contrib/mkefidisk.sh
rename to poky/scripts/contrib/mkefidisk.sh
diff --git a/import-layers/yocto-poky/scripts/contrib/oe-build-perf-report-email.py b/poky/scripts/contrib/oe-build-perf-report-email.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/contrib/oe-build-perf-report-email.py
rename to poky/scripts/contrib/oe-build-perf-report-email.py
diff --git a/import-layers/yocto-poky/scripts/contrib/patchreview.py b/poky/scripts/contrib/patchreview.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/contrib/patchreview.py
rename to poky/scripts/contrib/patchreview.py
diff --git a/import-layers/yocto-poky/scripts/contrib/patchtest.sh b/poky/scripts/contrib/patchtest.sh
similarity index 100%
rename from import-layers/yocto-poky/scripts/contrib/patchtest.sh
rename to poky/scripts/contrib/patchtest.sh
diff --git a/import-layers/yocto-poky/scripts/contrib/serdevtry b/poky/scripts/contrib/serdevtry
similarity index 100%
rename from import-layers/yocto-poky/scripts/contrib/serdevtry
rename to poky/scripts/contrib/serdevtry
diff --git a/import-layers/yocto-poky/scripts/contrib/test_build_time.sh b/poky/scripts/contrib/test_build_time.sh
similarity index 100%
rename from import-layers/yocto-poky/scripts/contrib/test_build_time.sh
rename to poky/scripts/contrib/test_build_time.sh
diff --git a/import-layers/yocto-poky/scripts/contrib/test_build_time_worker.sh b/poky/scripts/contrib/test_build_time_worker.sh
similarity index 100%
rename from import-layers/yocto-poky/scripts/contrib/test_build_time_worker.sh
rename to poky/scripts/contrib/test_build_time_worker.sh
diff --git a/import-layers/yocto-poky/scripts/contrib/uncovered b/poky/scripts/contrib/uncovered
similarity index 100%
rename from import-layers/yocto-poky/scripts/contrib/uncovered
rename to poky/scripts/contrib/uncovered
diff --git a/import-layers/yocto-poky/scripts/contrib/verify-homepage.py b/poky/scripts/contrib/verify-homepage.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/contrib/verify-homepage.py
rename to poky/scripts/contrib/verify-homepage.py
diff --git a/import-layers/yocto-poky/scripts/cp-noerror b/poky/scripts/cp-noerror
similarity index 100%
rename from import-layers/yocto-poky/scripts/cp-noerror
rename to poky/scripts/cp-noerror
diff --git a/import-layers/yocto-poky/scripts/create-pull-request b/poky/scripts/create-pull-request
similarity index 100%
rename from import-layers/yocto-poky/scripts/create-pull-request
rename to poky/scripts/create-pull-request
diff --git a/import-layers/yocto-poky/scripts/crosstap b/poky/scripts/crosstap
similarity index 100%
rename from import-layers/yocto-poky/scripts/crosstap
rename to poky/scripts/crosstap
diff --git a/import-layers/yocto-poky/scripts/devtool b/poky/scripts/devtool
similarity index 100%
rename from import-layers/yocto-poky/scripts/devtool
rename to poky/scripts/devtool
diff --git a/import-layers/yocto-poky/scripts/distro/build-recipe-list.py b/poky/scripts/distro/build-recipe-list.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/distro/build-recipe-list.py
rename to poky/scripts/distro/build-recipe-list.py
diff --git a/import-layers/yocto-poky/scripts/distro/distrocompare.sh b/poky/scripts/distro/distrocompare.sh
similarity index 100%
rename from import-layers/yocto-poky/scripts/distro/distrocompare.sh
rename to poky/scripts/distro/distrocompare.sh
diff --git a/import-layers/yocto-poky/scripts/gen-lockedsig-cache b/poky/scripts/gen-lockedsig-cache
similarity index 100%
rename from import-layers/yocto-poky/scripts/gen-lockedsig-cache
rename to poky/scripts/gen-lockedsig-cache
diff --git a/import-layers/yocto-poky/scripts/gen-site-config b/poky/scripts/gen-site-config
similarity index 100%
rename from import-layers/yocto-poky/scripts/gen-site-config
rename to poky/scripts/gen-site-config
diff --git a/import-layers/yocto-poky/scripts/lib/argparse_oe.py b/poky/scripts/lib/argparse_oe.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/argparse_oe.py
rename to poky/scripts/lib/argparse_oe.py
diff --git a/import-layers/yocto-poky/scripts/lib/build_perf/__init__.py b/poky/scripts/lib/build_perf/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/build_perf/__init__.py
rename to poky/scripts/lib/build_perf/__init__.py
diff --git a/import-layers/yocto-poky/scripts/lib/build_perf/html.py b/poky/scripts/lib/build_perf/html.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/build_perf/html.py
rename to poky/scripts/lib/build_perf/html.py
diff --git a/import-layers/yocto-poky/scripts/lib/build_perf/html/measurement_chart.html b/poky/scripts/lib/build_perf/html/measurement_chart.html
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/build_perf/html/measurement_chart.html
rename to poky/scripts/lib/build_perf/html/measurement_chart.html
diff --git a/import-layers/yocto-poky/scripts/lib/build_perf/html/report.html b/poky/scripts/lib/build_perf/html/report.html
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/build_perf/html/report.html
rename to poky/scripts/lib/build_perf/html/report.html
diff --git a/import-layers/yocto-poky/scripts/lib/build_perf/report.py b/poky/scripts/lib/build_perf/report.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/build_perf/report.py
rename to poky/scripts/lib/build_perf/report.py
diff --git a/import-layers/yocto-poky/scripts/lib/build_perf/scrape-html-report.js b/poky/scripts/lib/build_perf/scrape-html-report.js
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/build_perf/scrape-html-report.js
rename to poky/scripts/lib/build_perf/scrape-html-report.js
diff --git a/import-layers/yocto-poky/scripts/lib/buildstats.py b/poky/scripts/lib/buildstats.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/buildstats.py
rename to poky/scripts/lib/buildstats.py
diff --git a/import-layers/yocto-poky/scripts/lib/checklayer/__init__.py b/poky/scripts/lib/checklayer/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/checklayer/__init__.py
rename to poky/scripts/lib/checklayer/__init__.py
diff --git a/import-layers/yocto-poky/scripts/lib/checklayer/case.py b/poky/scripts/lib/checklayer/case.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/checklayer/case.py
rename to poky/scripts/lib/checklayer/case.py
diff --git a/import-layers/yocto-poky/scripts/lib/checklayer/cases/__init__.py b/poky/scripts/lib/checklayer/cases/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/checklayer/cases/__init__.py
rename to poky/scripts/lib/checklayer/cases/__init__.py
diff --git a/import-layers/yocto-poky/scripts/lib/checklayer/cases/bsp.py b/poky/scripts/lib/checklayer/cases/bsp.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/checklayer/cases/bsp.py
rename to poky/scripts/lib/checklayer/cases/bsp.py
diff --git a/import-layers/yocto-poky/scripts/lib/checklayer/cases/common.py b/poky/scripts/lib/checklayer/cases/common.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/checklayer/cases/common.py
rename to poky/scripts/lib/checklayer/cases/common.py
diff --git a/import-layers/yocto-poky/scripts/lib/checklayer/cases/distro.py b/poky/scripts/lib/checklayer/cases/distro.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/checklayer/cases/distro.py
rename to poky/scripts/lib/checklayer/cases/distro.py
diff --git a/import-layers/yocto-poky/scripts/lib/checklayer/context.py b/poky/scripts/lib/checklayer/context.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/checklayer/context.py
rename to poky/scripts/lib/checklayer/context.py
diff --git a/import-layers/yocto-poky/scripts/lib/devtool/__init__.py b/poky/scripts/lib/devtool/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/devtool/__init__.py
rename to poky/scripts/lib/devtool/__init__.py
diff --git a/import-layers/yocto-poky/scripts/lib/devtool/build.py b/poky/scripts/lib/devtool/build.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/devtool/build.py
rename to poky/scripts/lib/devtool/build.py
diff --git a/import-layers/yocto-poky/scripts/lib/devtool/build_image.py b/poky/scripts/lib/devtool/build_image.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/devtool/build_image.py
rename to poky/scripts/lib/devtool/build_image.py
diff --git a/import-layers/yocto-poky/scripts/lib/devtool/build_sdk.py b/poky/scripts/lib/devtool/build_sdk.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/devtool/build_sdk.py
rename to poky/scripts/lib/devtool/build_sdk.py
diff --git a/import-layers/yocto-poky/scripts/lib/devtool/deploy.py b/poky/scripts/lib/devtool/deploy.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/devtool/deploy.py
rename to poky/scripts/lib/devtool/deploy.py
diff --git a/import-layers/yocto-poky/scripts/lib/devtool/export.py b/poky/scripts/lib/devtool/export.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/devtool/export.py
rename to poky/scripts/lib/devtool/export.py
diff --git a/import-layers/yocto-poky/scripts/lib/devtool/import.py b/poky/scripts/lib/devtool/import.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/devtool/import.py
rename to poky/scripts/lib/devtool/import.py
diff --git a/import-layers/yocto-poky/scripts/lib/devtool/package.py b/poky/scripts/lib/devtool/package.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/devtool/package.py
rename to poky/scripts/lib/devtool/package.py
diff --git a/import-layers/yocto-poky/scripts/lib/devtool/runqemu.py b/poky/scripts/lib/devtool/runqemu.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/devtool/runqemu.py
rename to poky/scripts/lib/devtool/runqemu.py
diff --git a/import-layers/yocto-poky/scripts/lib/devtool/sdk.py b/poky/scripts/lib/devtool/sdk.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/devtool/sdk.py
rename to poky/scripts/lib/devtool/sdk.py
diff --git a/import-layers/yocto-poky/scripts/lib/devtool/search.py b/poky/scripts/lib/devtool/search.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/devtool/search.py
rename to poky/scripts/lib/devtool/search.py
diff --git a/import-layers/yocto-poky/scripts/lib/devtool/standard.py b/poky/scripts/lib/devtool/standard.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/devtool/standard.py
rename to poky/scripts/lib/devtool/standard.py
diff --git a/import-layers/yocto-poky/scripts/lib/devtool/upgrade.py b/poky/scripts/lib/devtool/upgrade.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/devtool/upgrade.py
rename to poky/scripts/lib/devtool/upgrade.py
diff --git a/import-layers/yocto-poky/scripts/lib/devtool/utilcmds.py b/poky/scripts/lib/devtool/utilcmds.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/devtool/utilcmds.py
rename to poky/scripts/lib/devtool/utilcmds.py
diff --git a/import-layers/yocto-poky/scripts/lib/recipetool/__init__.py b/poky/scripts/lib/recipetool/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/recipetool/__init__.py
rename to poky/scripts/lib/recipetool/__init__.py
diff --git a/import-layers/yocto-poky/scripts/lib/recipetool/append.py b/poky/scripts/lib/recipetool/append.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/recipetool/append.py
rename to poky/scripts/lib/recipetool/append.py
diff --git a/import-layers/yocto-poky/scripts/lib/recipetool/create.py b/poky/scripts/lib/recipetool/create.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/recipetool/create.py
rename to poky/scripts/lib/recipetool/create.py
diff --git a/import-layers/yocto-poky/scripts/lib/recipetool/create_buildsys.py b/poky/scripts/lib/recipetool/create_buildsys.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/recipetool/create_buildsys.py
rename to poky/scripts/lib/recipetool/create_buildsys.py
diff --git a/import-layers/yocto-poky/scripts/lib/recipetool/create_buildsys_python.py b/poky/scripts/lib/recipetool/create_buildsys_python.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/recipetool/create_buildsys_python.py
rename to poky/scripts/lib/recipetool/create_buildsys_python.py
diff --git a/import-layers/yocto-poky/scripts/lib/recipetool/create_kernel.py b/poky/scripts/lib/recipetool/create_kernel.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/recipetool/create_kernel.py
rename to poky/scripts/lib/recipetool/create_kernel.py
diff --git a/import-layers/yocto-poky/scripts/lib/recipetool/create_kmod.py b/poky/scripts/lib/recipetool/create_kmod.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/recipetool/create_kmod.py
rename to poky/scripts/lib/recipetool/create_kmod.py
diff --git a/import-layers/yocto-poky/scripts/lib/recipetool/create_npm.py b/poky/scripts/lib/recipetool/create_npm.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/recipetool/create_npm.py
rename to poky/scripts/lib/recipetool/create_npm.py
diff --git a/import-layers/yocto-poky/scripts/lib/recipetool/newappend.py b/poky/scripts/lib/recipetool/newappend.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/recipetool/newappend.py
rename to poky/scripts/lib/recipetool/newappend.py
diff --git a/import-layers/yocto-poky/scripts/lib/recipetool/setvar.py b/poky/scripts/lib/recipetool/setvar.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/recipetool/setvar.py
rename to poky/scripts/lib/recipetool/setvar.py
diff --git a/import-layers/yocto-poky/scripts/lib/scriptpath.py b/poky/scripts/lib/scriptpath.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/scriptpath.py
rename to poky/scripts/lib/scriptpath.py
diff --git a/import-layers/yocto-poky/scripts/lib/scriptutils.py b/poky/scripts/lib/scriptutils.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/scriptutils.py
rename to poky/scripts/lib/scriptutils.py
diff --git a/import-layers/yocto-poky/scripts/lib/wic/__init__.py b/poky/scripts/lib/wic/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/wic/__init__.py
rename to poky/scripts/lib/wic/__init__.py
diff --git a/import-layers/yocto-poky/scripts/lib/wic/canned-wks/common.wks.inc b/poky/scripts/lib/wic/canned-wks/common.wks.inc
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/wic/canned-wks/common.wks.inc
rename to poky/scripts/lib/wic/canned-wks/common.wks.inc
diff --git a/import-layers/yocto-poky/scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg b/poky/scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg
rename to poky/scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg
diff --git a/import-layers/yocto-poky/scripts/lib/wic/canned-wks/directdisk-bootloader-config.wks b/poky/scripts/lib/wic/canned-wks/directdisk-bootloader-config.wks
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/wic/canned-wks/directdisk-bootloader-config.wks
rename to poky/scripts/lib/wic/canned-wks/directdisk-bootloader-config.wks
diff --git a/import-layers/yocto-poky/scripts/lib/wic/canned-wks/directdisk-gpt.wks b/poky/scripts/lib/wic/canned-wks/directdisk-gpt.wks
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/wic/canned-wks/directdisk-gpt.wks
rename to poky/scripts/lib/wic/canned-wks/directdisk-gpt.wks
diff --git a/import-layers/yocto-poky/scripts/lib/wic/canned-wks/directdisk-multi-rootfs.wks b/poky/scripts/lib/wic/canned-wks/directdisk-multi-rootfs.wks
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/wic/canned-wks/directdisk-multi-rootfs.wks
rename to poky/scripts/lib/wic/canned-wks/directdisk-multi-rootfs.wks
diff --git a/import-layers/yocto-poky/scripts/lib/wic/canned-wks/directdisk.wks b/poky/scripts/lib/wic/canned-wks/directdisk.wks
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/wic/canned-wks/directdisk.wks
rename to poky/scripts/lib/wic/canned-wks/directdisk.wks
diff --git a/import-layers/yocto-poky/scripts/lib/wic/canned-wks/efi-bootdisk.wks.in b/poky/scripts/lib/wic/canned-wks/efi-bootdisk.wks.in
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/wic/canned-wks/efi-bootdisk.wks.in
rename to poky/scripts/lib/wic/canned-wks/efi-bootdisk.wks.in
diff --git a/import-layers/yocto-poky/scripts/lib/wic/canned-wks/mkefidisk.wks b/poky/scripts/lib/wic/canned-wks/mkefidisk.wks
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/wic/canned-wks/mkefidisk.wks
rename to poky/scripts/lib/wic/canned-wks/mkefidisk.wks
diff --git a/import-layers/yocto-poky/scripts/lib/wic/canned-wks/mkhybridiso.wks b/poky/scripts/lib/wic/canned-wks/mkhybridiso.wks
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/wic/canned-wks/mkhybridiso.wks
rename to poky/scripts/lib/wic/canned-wks/mkhybridiso.wks
diff --git a/import-layers/yocto-poky/scripts/lib/wic/canned-wks/qemux86-directdisk.wks b/poky/scripts/lib/wic/canned-wks/qemux86-directdisk.wks
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/wic/canned-wks/qemux86-directdisk.wks
rename to poky/scripts/lib/wic/canned-wks/qemux86-directdisk.wks
diff --git a/import-layers/yocto-poky/scripts/lib/wic/canned-wks/sdimage-bootpart.wks b/poky/scripts/lib/wic/canned-wks/sdimage-bootpart.wks
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/wic/canned-wks/sdimage-bootpart.wks
rename to poky/scripts/lib/wic/canned-wks/sdimage-bootpart.wks
diff --git a/import-layers/yocto-poky/scripts/lib/wic/canned-wks/systemd-bootdisk.wks b/poky/scripts/lib/wic/canned-wks/systemd-bootdisk.wks
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/wic/canned-wks/systemd-bootdisk.wks
rename to poky/scripts/lib/wic/canned-wks/systemd-bootdisk.wks
diff --git a/import-layers/yocto-poky/scripts/lib/wic/engine.py b/poky/scripts/lib/wic/engine.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/wic/engine.py
rename to poky/scripts/lib/wic/engine.py
diff --git a/import-layers/yocto-poky/scripts/lib/wic/filemap.py b/poky/scripts/lib/wic/filemap.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/wic/filemap.py
rename to poky/scripts/lib/wic/filemap.py
diff --git a/import-layers/yocto-poky/scripts/lib/wic/help.py b/poky/scripts/lib/wic/help.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/wic/help.py
rename to poky/scripts/lib/wic/help.py
diff --git a/import-layers/yocto-poky/scripts/lib/wic/ksparser.py b/poky/scripts/lib/wic/ksparser.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/wic/ksparser.py
rename to poky/scripts/lib/wic/ksparser.py
diff --git a/import-layers/yocto-poky/scripts/lib/wic/misc.py b/poky/scripts/lib/wic/misc.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/wic/misc.py
rename to poky/scripts/lib/wic/misc.py
diff --git a/import-layers/yocto-poky/scripts/lib/wic/partition.py b/poky/scripts/lib/wic/partition.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/wic/partition.py
rename to poky/scripts/lib/wic/partition.py
diff --git a/import-layers/yocto-poky/scripts/lib/wic/pluginbase.py b/poky/scripts/lib/wic/pluginbase.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/wic/pluginbase.py
rename to poky/scripts/lib/wic/pluginbase.py
diff --git a/import-layers/yocto-poky/scripts/lib/wic/plugins/imager/direct.py b/poky/scripts/lib/wic/plugins/imager/direct.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/wic/plugins/imager/direct.py
rename to poky/scripts/lib/wic/plugins/imager/direct.py
diff --git a/import-layers/yocto-poky/scripts/lib/wic/plugins/source/bootimg-efi.py b/poky/scripts/lib/wic/plugins/source/bootimg-efi.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/wic/plugins/source/bootimg-efi.py
rename to poky/scripts/lib/wic/plugins/source/bootimg-efi.py
diff --git a/import-layers/yocto-poky/scripts/lib/wic/plugins/source/bootimg-partition.py b/poky/scripts/lib/wic/plugins/source/bootimg-partition.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/wic/plugins/source/bootimg-partition.py
rename to poky/scripts/lib/wic/plugins/source/bootimg-partition.py
diff --git a/import-layers/yocto-poky/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/poky/scripts/lib/wic/plugins/source/bootimg-pcbios.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/wic/plugins/source/bootimg-pcbios.py
rename to poky/scripts/lib/wic/plugins/source/bootimg-pcbios.py
diff --git a/import-layers/yocto-poky/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/poky/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
rename to poky/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
diff --git a/import-layers/yocto-poky/scripts/lib/wic/plugins/source/rawcopy.py b/poky/scripts/lib/wic/plugins/source/rawcopy.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/wic/plugins/source/rawcopy.py
rename to poky/scripts/lib/wic/plugins/source/rawcopy.py
diff --git a/import-layers/yocto-poky/scripts/lib/wic/plugins/source/rootfs.py b/poky/scripts/lib/wic/plugins/source/rootfs.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/lib/wic/plugins/source/rootfs.py
rename to poky/scripts/lib/wic/plugins/source/rootfs.py
diff --git a/import-layers/yocto-poky/scripts/lnr b/poky/scripts/lnr
similarity index 100%
rename from import-layers/yocto-poky/scripts/lnr
rename to poky/scripts/lnr
diff --git a/import-layers/yocto-poky/scripts/multilib_header_wrapper.h b/poky/scripts/multilib_header_wrapper.h
similarity index 100%
rename from import-layers/yocto-poky/scripts/multilib_header_wrapper.h
rename to poky/scripts/multilib_header_wrapper.h
diff --git a/import-layers/yocto-poky/scripts/native-intercept/chown b/poky/scripts/native-intercept/chown
similarity index 100%
rename from import-layers/yocto-poky/scripts/native-intercept/chown
rename to poky/scripts/native-intercept/chown
diff --git a/import-layers/yocto-poky/scripts/oe-build-perf-report b/poky/scripts/oe-build-perf-report
similarity index 100%
rename from import-layers/yocto-poky/scripts/oe-build-perf-report
rename to poky/scripts/oe-build-perf-report
diff --git a/import-layers/yocto-poky/scripts/oe-build-perf-test b/poky/scripts/oe-build-perf-test
similarity index 100%
rename from import-layers/yocto-poky/scripts/oe-build-perf-test
rename to poky/scripts/oe-build-perf-test
diff --git a/import-layers/yocto-poky/scripts/oe-buildenv-internal b/poky/scripts/oe-buildenv-internal
similarity index 100%
rename from import-layers/yocto-poky/scripts/oe-buildenv-internal
rename to poky/scripts/oe-buildenv-internal
diff --git a/import-layers/yocto-poky/scripts/oe-check-sstate b/poky/scripts/oe-check-sstate
similarity index 100%
rename from import-layers/yocto-poky/scripts/oe-check-sstate
rename to poky/scripts/oe-check-sstate
diff --git a/import-layers/yocto-poky/scripts/oe-depends-dot b/poky/scripts/oe-depends-dot
similarity index 100%
rename from import-layers/yocto-poky/scripts/oe-depends-dot
rename to poky/scripts/oe-depends-dot
diff --git a/import-layers/yocto-poky/scripts/oe-find-native-sysroot b/poky/scripts/oe-find-native-sysroot
similarity index 100%
rename from import-layers/yocto-poky/scripts/oe-find-native-sysroot
rename to poky/scripts/oe-find-native-sysroot
diff --git a/import-layers/yocto-poky/scripts/oe-git-archive b/poky/scripts/oe-git-archive
similarity index 100%
rename from import-layers/yocto-poky/scripts/oe-git-archive
rename to poky/scripts/oe-git-archive
diff --git a/import-layers/yocto-poky/scripts/oe-git-proxy b/poky/scripts/oe-git-proxy
similarity index 100%
rename from import-layers/yocto-poky/scripts/oe-git-proxy
rename to poky/scripts/oe-git-proxy
diff --git a/import-layers/yocto-poky/scripts/oe-gnome-terminal-phonehome b/poky/scripts/oe-gnome-terminal-phonehome
similarity index 100%
rename from import-layers/yocto-poky/scripts/oe-gnome-terminal-phonehome
rename to poky/scripts/oe-gnome-terminal-phonehome
diff --git a/import-layers/yocto-poky/scripts/oe-pkgdata-util b/poky/scripts/oe-pkgdata-util
similarity index 100%
rename from import-layers/yocto-poky/scripts/oe-pkgdata-util
rename to poky/scripts/oe-pkgdata-util
diff --git a/import-layers/yocto-poky/scripts/oe-publish-sdk b/poky/scripts/oe-publish-sdk
similarity index 100%
rename from import-layers/yocto-poky/scripts/oe-publish-sdk
rename to poky/scripts/oe-publish-sdk
diff --git a/import-layers/yocto-poky/scripts/oe-run-native b/poky/scripts/oe-run-native
similarity index 100%
rename from import-layers/yocto-poky/scripts/oe-run-native
rename to poky/scripts/oe-run-native
diff --git a/import-layers/yocto-poky/scripts/oe-selftest b/poky/scripts/oe-selftest
similarity index 100%
rename from import-layers/yocto-poky/scripts/oe-selftest
rename to poky/scripts/oe-selftest
diff --git a/import-layers/yocto-poky/scripts/oe-setup-builddir b/poky/scripts/oe-setup-builddir
similarity index 100%
rename from import-layers/yocto-poky/scripts/oe-setup-builddir
rename to poky/scripts/oe-setup-builddir
diff --git a/import-layers/yocto-poky/scripts/oe-test b/poky/scripts/oe-test
similarity index 100%
rename from import-layers/yocto-poky/scripts/oe-test
rename to poky/scripts/oe-test
diff --git a/import-layers/yocto-poky/scripts/oe-trim-schemas b/poky/scripts/oe-trim-schemas
similarity index 100%
rename from import-layers/yocto-poky/scripts/oe-trim-schemas
rename to poky/scripts/oe-trim-schemas
diff --git a/import-layers/yocto-poky/scripts/oepydevshell-internal.py b/poky/scripts/oepydevshell-internal.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/oepydevshell-internal.py
rename to poky/scripts/oepydevshell-internal.py
diff --git a/import-layers/yocto-poky/scripts/opkg-query-helper.py b/poky/scripts/opkg-query-helper.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/opkg-query-helper.py
rename to poky/scripts/opkg-query-helper.py
diff --git a/import-layers/yocto-poky/scripts/postinst-intercepts/delay_to_first_boot b/poky/scripts/postinst-intercepts/delay_to_first_boot
similarity index 100%
rename from import-layers/yocto-poky/scripts/postinst-intercepts/delay_to_first_boot
rename to poky/scripts/postinst-intercepts/delay_to_first_boot
diff --git a/import-layers/yocto-poky/scripts/postinst-intercepts/postinst_intercept b/poky/scripts/postinst-intercepts/postinst_intercept
similarity index 100%
rename from import-layers/yocto-poky/scripts/postinst-intercepts/postinst_intercept
rename to poky/scripts/postinst-intercepts/postinst_intercept
diff --git a/import-layers/yocto-poky/scripts/postinst-intercepts/update_font_cache b/poky/scripts/postinst-intercepts/update_font_cache
similarity index 100%
rename from import-layers/yocto-poky/scripts/postinst-intercepts/update_font_cache
rename to poky/scripts/postinst-intercepts/update_font_cache
diff --git a/import-layers/yocto-poky/scripts/postinst-intercepts/update_gio_module_cache b/poky/scripts/postinst-intercepts/update_gio_module_cache
similarity index 100%
rename from import-layers/yocto-poky/scripts/postinst-intercepts/update_gio_module_cache
rename to poky/scripts/postinst-intercepts/update_gio_module_cache
diff --git a/import-layers/yocto-poky/scripts/postinst-intercepts/update_icon_cache b/poky/scripts/postinst-intercepts/update_icon_cache
similarity index 100%
rename from import-layers/yocto-poky/scripts/postinst-intercepts/update_icon_cache
rename to poky/scripts/postinst-intercepts/update_icon_cache
diff --git a/import-layers/yocto-poky/scripts/postinst-intercepts/update_pixbuf_cache b/poky/scripts/postinst-intercepts/update_pixbuf_cache
similarity index 100%
rename from import-layers/yocto-poky/scripts/postinst-intercepts/update_pixbuf_cache
rename to poky/scripts/postinst-intercepts/update_pixbuf_cache
diff --git a/import-layers/yocto-poky/scripts/pybootchartgui/AUTHORS b/poky/scripts/pybootchartgui/AUTHORS
similarity index 100%
rename from import-layers/yocto-poky/scripts/pybootchartgui/AUTHORS
rename to poky/scripts/pybootchartgui/AUTHORS
diff --git a/import-layers/yocto-poky/scripts/pybootchartgui/COPYING b/poky/scripts/pybootchartgui/COPYING
similarity index 100%
rename from import-layers/yocto-poky/scripts/pybootchartgui/COPYING
rename to poky/scripts/pybootchartgui/COPYING
diff --git a/import-layers/yocto-poky/scripts/pybootchartgui/MAINTAINERS b/poky/scripts/pybootchartgui/MAINTAINERS
similarity index 100%
rename from import-layers/yocto-poky/scripts/pybootchartgui/MAINTAINERS
rename to poky/scripts/pybootchartgui/MAINTAINERS
diff --git a/import-layers/yocto-poky/scripts/pybootchartgui/NEWS b/poky/scripts/pybootchartgui/NEWS
similarity index 100%
rename from import-layers/yocto-poky/scripts/pybootchartgui/NEWS
rename to poky/scripts/pybootchartgui/NEWS
diff --git a/import-layers/yocto-poky/scripts/pybootchartgui/README.pybootchart b/poky/scripts/pybootchartgui/README.pybootchart
similarity index 100%
rename from import-layers/yocto-poky/scripts/pybootchartgui/README.pybootchart
rename to poky/scripts/pybootchartgui/README.pybootchart
diff --git a/import-layers/yocto-poky/scripts/pybootchartgui/pybootchartgui.py b/poky/scripts/pybootchartgui/pybootchartgui.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/pybootchartgui/pybootchartgui.py
rename to poky/scripts/pybootchartgui/pybootchartgui.py
diff --git a/import-layers/yocto-poky/scripts/pybootchartgui/pybootchartgui/__init__.py b/poky/scripts/pybootchartgui/pybootchartgui/__init__.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/pybootchartgui/pybootchartgui/__init__.py
rename to poky/scripts/pybootchartgui/pybootchartgui/__init__.py
diff --git a/import-layers/yocto-poky/scripts/pybootchartgui/pybootchartgui/batch.py b/poky/scripts/pybootchartgui/pybootchartgui/batch.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/pybootchartgui/pybootchartgui/batch.py
rename to poky/scripts/pybootchartgui/pybootchartgui/batch.py
diff --git a/import-layers/yocto-poky/scripts/pybootchartgui/pybootchartgui/draw.py b/poky/scripts/pybootchartgui/pybootchartgui/draw.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/pybootchartgui/pybootchartgui/draw.py
rename to poky/scripts/pybootchartgui/pybootchartgui/draw.py
diff --git a/import-layers/yocto-poky/scripts/pybootchartgui/pybootchartgui/gui.py b/poky/scripts/pybootchartgui/pybootchartgui/gui.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/pybootchartgui/pybootchartgui/gui.py
rename to poky/scripts/pybootchartgui/pybootchartgui/gui.py
diff --git a/import-layers/yocto-poky/scripts/pybootchartgui/pybootchartgui/main.py b/poky/scripts/pybootchartgui/pybootchartgui/main.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/pybootchartgui/pybootchartgui/main.py
rename to poky/scripts/pybootchartgui/pybootchartgui/main.py
diff --git a/import-layers/yocto-poky/scripts/pybootchartgui/pybootchartgui/main.py.in b/poky/scripts/pybootchartgui/pybootchartgui/main.py.in
similarity index 100%
rename from import-layers/yocto-poky/scripts/pybootchartgui/pybootchartgui/main.py.in
rename to poky/scripts/pybootchartgui/pybootchartgui/main.py.in
diff --git a/import-layers/yocto-poky/scripts/pybootchartgui/pybootchartgui/parsing.py b/poky/scripts/pybootchartgui/pybootchartgui/parsing.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/pybootchartgui/pybootchartgui/parsing.py
rename to poky/scripts/pybootchartgui/pybootchartgui/parsing.py
diff --git a/import-layers/yocto-poky/scripts/pybootchartgui/pybootchartgui/process_tree.py b/poky/scripts/pybootchartgui/pybootchartgui/process_tree.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/pybootchartgui/pybootchartgui/process_tree.py
rename to poky/scripts/pybootchartgui/pybootchartgui/process_tree.py
diff --git a/import-layers/yocto-poky/scripts/pybootchartgui/pybootchartgui/samples.py b/poky/scripts/pybootchartgui/pybootchartgui/samples.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/pybootchartgui/pybootchartgui/samples.py
rename to poky/scripts/pybootchartgui/pybootchartgui/samples.py
diff --git a/import-layers/yocto-poky/scripts/pybootchartgui/pybootchartgui/tests/parser_test.py b/poky/scripts/pybootchartgui/pybootchartgui/tests/parser_test.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/pybootchartgui/pybootchartgui/tests/parser_test.py
rename to poky/scripts/pybootchartgui/pybootchartgui/tests/parser_test.py
diff --git a/import-layers/yocto-poky/scripts/pybootchartgui/pybootchartgui/tests/process_tree_test.py b/poky/scripts/pybootchartgui/pybootchartgui/tests/process_tree_test.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/pybootchartgui/pybootchartgui/tests/process_tree_test.py
rename to poky/scripts/pybootchartgui/pybootchartgui/tests/process_tree_test.py
diff --git a/import-layers/yocto-poky/scripts/pythondeps b/poky/scripts/pythondeps
similarity index 100%
rename from import-layers/yocto-poky/scripts/pythondeps
rename to poky/scripts/pythondeps
diff --git a/import-layers/yocto-poky/scripts/recipetool b/poky/scripts/recipetool
similarity index 100%
rename from import-layers/yocto-poky/scripts/recipetool
rename to poky/scripts/recipetool
diff --git a/import-layers/yocto-poky/scripts/relocate_sdk.py b/poky/scripts/relocate_sdk.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/relocate_sdk.py
rename to poky/scripts/relocate_sdk.py
diff --git a/import-layers/yocto-poky/scripts/rootfs_rpm-extract-postinst.awk b/poky/scripts/rootfs_rpm-extract-postinst.awk
similarity index 100%
rename from import-layers/yocto-poky/scripts/rootfs_rpm-extract-postinst.awk
rename to poky/scripts/rootfs_rpm-extract-postinst.awk
diff --git a/import-layers/yocto-poky/scripts/rpm2cpio.sh b/poky/scripts/rpm2cpio.sh
similarity index 100%
rename from import-layers/yocto-poky/scripts/rpm2cpio.sh
rename to poky/scripts/rpm2cpio.sh
diff --git a/import-layers/yocto-poky/scripts/runqemu b/poky/scripts/runqemu
similarity index 100%
rename from import-layers/yocto-poky/scripts/runqemu
rename to poky/scripts/runqemu
diff --git a/import-layers/yocto-poky/scripts/runqemu-addptable2image b/poky/scripts/runqemu-addptable2image
similarity index 100%
rename from import-layers/yocto-poky/scripts/runqemu-addptable2image
rename to poky/scripts/runqemu-addptable2image
diff --git a/import-layers/yocto-poky/scripts/runqemu-export-rootfs b/poky/scripts/runqemu-export-rootfs
similarity index 100%
rename from import-layers/yocto-poky/scripts/runqemu-export-rootfs
rename to poky/scripts/runqemu-export-rootfs
diff --git a/import-layers/yocto-poky/scripts/runqemu-extract-sdk b/poky/scripts/runqemu-extract-sdk
similarity index 100%
rename from import-layers/yocto-poky/scripts/runqemu-extract-sdk
rename to poky/scripts/runqemu-extract-sdk
diff --git a/import-layers/yocto-poky/scripts/runqemu-gen-tapdevs b/poky/scripts/runqemu-gen-tapdevs
similarity index 100%
rename from import-layers/yocto-poky/scripts/runqemu-gen-tapdevs
rename to poky/scripts/runqemu-gen-tapdevs
diff --git a/import-layers/yocto-poky/scripts/runqemu-ifdown b/poky/scripts/runqemu-ifdown
similarity index 100%
rename from import-layers/yocto-poky/scripts/runqemu-ifdown
rename to poky/scripts/runqemu-ifdown
diff --git a/import-layers/yocto-poky/scripts/runqemu-ifup b/poky/scripts/runqemu-ifup
similarity index 100%
rename from import-layers/yocto-poky/scripts/runqemu-ifup
rename to poky/scripts/runqemu-ifup
diff --git a/import-layers/yocto-poky/scripts/runqemu.README b/poky/scripts/runqemu.README
similarity index 100%
rename from import-layers/yocto-poky/scripts/runqemu.README
rename to poky/scripts/runqemu.README
diff --git a/import-layers/yocto-poky/scripts/send-error-report b/poky/scripts/send-error-report
similarity index 100%
rename from import-layers/yocto-poky/scripts/send-error-report
rename to poky/scripts/send-error-report
diff --git a/import-layers/yocto-poky/scripts/send-pull-request b/poky/scripts/send-pull-request
similarity index 100%
rename from import-layers/yocto-poky/scripts/send-pull-request
rename to poky/scripts/send-pull-request
diff --git a/import-layers/yocto-poky/scripts/sstate-cache-management.sh b/poky/scripts/sstate-cache-management.sh
similarity index 100%
rename from import-layers/yocto-poky/scripts/sstate-cache-management.sh
rename to poky/scripts/sstate-cache-management.sh
diff --git a/import-layers/yocto-poky/scripts/sstate-diff-machines.sh b/poky/scripts/sstate-diff-machines.sh
similarity index 100%
rename from import-layers/yocto-poky/scripts/sstate-diff-machines.sh
rename to poky/scripts/sstate-diff-machines.sh
diff --git a/import-layers/yocto-poky/scripts/sstate-sysroot-cruft.sh b/poky/scripts/sstate-sysroot-cruft.sh
similarity index 100%
rename from import-layers/yocto-poky/scripts/sstate-sysroot-cruft.sh
rename to poky/scripts/sstate-sysroot-cruft.sh
diff --git a/import-layers/yocto-poky/scripts/sysroot-relativelinks.py b/poky/scripts/sysroot-relativelinks.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/sysroot-relativelinks.py
rename to poky/scripts/sysroot-relativelinks.py
diff --git a/import-layers/yocto-poky/scripts/task-time b/poky/scripts/task-time
similarity index 100%
rename from import-layers/yocto-poky/scripts/task-time
rename to poky/scripts/task-time
diff --git a/import-layers/yocto-poky/scripts/test-reexec b/poky/scripts/test-reexec
similarity index 100%
rename from import-layers/yocto-poky/scripts/test-reexec
rename to poky/scripts/test-reexec
diff --git a/import-layers/yocto-poky/scripts/test-remote-image b/poky/scripts/test-remote-image
similarity index 100%
rename from import-layers/yocto-poky/scripts/test-remote-image
rename to poky/scripts/test-remote-image
diff --git a/import-layers/yocto-poky/scripts/tiny/dirsize.py b/poky/scripts/tiny/dirsize.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/tiny/dirsize.py
rename to poky/scripts/tiny/dirsize.py
diff --git a/import-layers/yocto-poky/scripts/tiny/ksize.py b/poky/scripts/tiny/ksize.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/tiny/ksize.py
rename to poky/scripts/tiny/ksize.py
diff --git a/import-layers/yocto-poky/scripts/tiny/ksum.py b/poky/scripts/tiny/ksum.py
similarity index 100%
rename from import-layers/yocto-poky/scripts/tiny/ksum.py
rename to poky/scripts/tiny/ksum.py
diff --git a/import-layers/yocto-poky/scripts/verify-bashisms b/poky/scripts/verify-bashisms
similarity index 100%
rename from import-layers/yocto-poky/scripts/verify-bashisms
rename to poky/scripts/verify-bashisms
diff --git a/import-layers/yocto-poky/scripts/wic b/poky/scripts/wic
similarity index 100%
rename from import-layers/yocto-poky/scripts/wic
rename to poky/scripts/wic
diff --git a/import-layers/yocto-poky/scripts/yocto-check-layer b/poky/scripts/yocto-check-layer
similarity index 100%
rename from import-layers/yocto-poky/scripts/yocto-check-layer
rename to poky/scripts/yocto-check-layer
diff --git a/import-layers/yocto-poky/scripts/yocto-check-layer-wrapper b/poky/scripts/yocto-check-layer-wrapper
similarity index 100%
rename from import-layers/yocto-poky/scripts/yocto-check-layer-wrapper
rename to poky/scripts/yocto-check-layer-wrapper
diff --git a/scripts b/scripts
index 4b5b575..897f41d 120000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-import-layers/yocto-poky/scripts
\ No newline at end of file
+poky/scripts/
\ No newline at end of file