diff --git a/meta-extras/packages/dhcp/dhcp_3.0.2.bb b/meta/packages/dhcp/dhcp_3.0.2.bb
similarity index 100%
rename from meta-extras/packages/dhcp/dhcp_3.0.2.bb
rename to meta/packages/dhcp/dhcp_3.0.2.bb
diff --git a/meta-extras/packages/dhcp/files/default-relay b/meta/packages/dhcp/files/default-relay
similarity index 100%
rename from meta-extras/packages/dhcp/files/default-relay
rename to meta/packages/dhcp/files/default-relay
diff --git a/meta-extras/packages/dhcp/files/default-server b/meta/packages/dhcp/files/default-server
similarity index 100%
rename from meta-extras/packages/dhcp/files/default-server
rename to meta/packages/dhcp/files/default-server
diff --git a/meta-extras/packages/dhcp/files/dhclient.conf b/meta/packages/dhcp/files/dhclient.conf
similarity index 100%
rename from meta-extras/packages/dhcp/files/dhclient.conf
rename to meta/packages/dhcp/files/dhclient.conf
diff --git a/meta-extras/packages/dhcp/files/dhcp-3.0.3-dhclient-dbus.patch b/meta/packages/dhcp/files/dhcp-3.0.3-dhclient-dbus.patch
similarity index 100%
rename from meta-extras/packages/dhcp/files/dhcp-3.0.3-dhclient-dbus.patch
rename to meta/packages/dhcp/files/dhcp-3.0.3-dhclient-dbus.patch
diff --git a/meta-extras/packages/dhcp/files/dhcpd.conf b/meta/packages/dhcp/files/dhcpd.conf
similarity index 100%
rename from meta-extras/packages/dhcp/files/dhcpd.conf
rename to meta/packages/dhcp/files/dhcpd.conf
diff --git a/meta-extras/packages/dhcp/files/fixincludes.patch b/meta/packages/dhcp/files/fixincludes.patch
similarity index 100%
rename from meta-extras/packages/dhcp/files/fixincludes.patch
rename to meta/packages/dhcp/files/fixincludes.patch
diff --git a/meta-extras/packages/dhcp/files/init-relay b/meta/packages/dhcp/files/init-relay
similarity index 100%
rename from meta-extras/packages/dhcp/files/init-relay
rename to meta/packages/dhcp/files/init-relay
diff --git a/meta-extras/packages/dhcp/files/init-server b/meta/packages/dhcp/files/init-server
similarity index 100%
rename from meta-extras/packages/dhcp/files/init-server
rename to meta/packages/dhcp/files/init-server
diff --git a/meta-extras/packages/dhcp/files/noattrmode.patch b/meta/packages/dhcp/files/noattrmode.patch
similarity index 100%
rename from meta-extras/packages/dhcp/files/noattrmode.patch
rename to meta/packages/dhcp/files/noattrmode.patch