meta-ieisystem: Rename layer name

Since the company name is ieisystems and the domain name is ieisystem
in order to be consistent with the domain name, the layer name is
replaced with ieisystem.

Link: https://en.ieisystem.com/

Signed-off-by: George Liu <liuxiwei@ieisystem.com>
Change-Id: Ie8e02d5b9f20a92ce4bf8c53ec291e2b51dc43f5
diff --git a/meta-ieisystems/COPYING.MIT b/meta-ieisystem/COPYING.MIT
similarity index 100%
rename from meta-ieisystems/COPYING.MIT
rename to meta-ieisystem/COPYING.MIT
diff --git a/meta-ieisystems/COPYING.apache-2.0 b/meta-ieisystem/COPYING.apache-2.0
similarity index 100%
rename from meta-ieisystems/COPYING.apache-2.0
rename to meta-ieisystem/COPYING.apache-2.0
diff --git a/meta-ieisystems/LICENSE b/meta-ieisystem/LICENSE
similarity index 84%
rename from meta-ieisystems/LICENSE
rename to meta-ieisystem/LICENSE
index 1dab391..b9d4f1e 100644
--- a/meta-ieisystems/LICENSE
+++ b/meta-ieisystem/LICENSE
@@ -1,4 +1,4 @@
-Different components of meta-ieisystems are under different licenses
+Different components of meta-ieisystem are under different licenses
 (a mix of MIT and Apache-2.0). Please see:
 
 COPYING.Apache-2.0
diff --git a/meta-ieisystems/OWNERS b/meta-ieisystem/OWNERS
similarity index 100%
rename from meta-ieisystems/OWNERS
rename to meta-ieisystem/OWNERS
diff --git a/meta-ieisystem/conf/layer.conf b/meta-ieisystem/conf/layer.conf
new file mode 100644
index 0000000..1771003
--- /dev/null
+++ b/meta-ieisystem/conf/layer.conf
@@ -0,0 +1,10 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have recipes-* directories, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
+            ${LAYERDIR}/recipes-*/*/*.bbappend"
+
+BBFILE_COLLECTIONS += "ieisystem-layer"
+BBFILE_PATTERN_ieisystem-layer = "^${LAYERDIR}/"
+LAYERSERIES_COMPAT_ieisystem-layer = "nanbield scarthgap"
diff --git a/meta-ieisystems/meta-fp5280g3/conf/distro/openbmc-fp5280g3.conf b/meta-ieisystem/meta-fp5280g3/conf/distro/openbmc-fp5280g3.conf
similarity index 100%
rename from meta-ieisystems/meta-fp5280g3/conf/distro/openbmc-fp5280g3.conf
rename to meta-ieisystem/meta-fp5280g3/conf/distro/openbmc-fp5280g3.conf
diff --git a/meta-ieisystems/meta-fp5280g3/conf/layer.conf b/meta-ieisystem/meta-fp5280g3/conf/layer.conf
similarity index 100%
rename from meta-ieisystems/meta-fp5280g3/conf/layer.conf
rename to meta-ieisystem/meta-fp5280g3/conf/layer.conf
diff --git a/meta-ieisystems/meta-fp5280g3/conf/machine/fp5280g3.conf b/meta-ieisystem/meta-fp5280g3/conf/machine/fp5280g3.conf
similarity index 82%
rename from meta-ieisystems/meta-fp5280g3/conf/machine/fp5280g3.conf
rename to meta-ieisystem/meta-fp5280g3/conf/machine/fp5280g3.conf
index 0e81ea0..4c99703 100644
--- a/meta-ieisystems/meta-fp5280g3/conf/machine/fp5280g3.conf
+++ b/meta-ieisystem/meta-fp5280g3/conf/machine/fp5280g3.conf
@@ -1,11 +1,11 @@
 KMACHINE = "aspeed"
 KERNEL_DEVICETREE = " \
-    aspeed/${KMACHINE}-bmc-ieisystems-${MACHINE}.dtb \
+    aspeed/${KMACHINE}-bmc-ieisystem-${MACHINE}.dtb \
 "
 
 UBOOT_MACHINE = "ast2600_openbmc_spl_emmc_defconfig"
 UBOOT_DEVICETREE = "ast2600-evb"
-#UBOOT_DEVICETREE = "ast2600-ieisystems-fp5280g3"
+#UBOOT_DEVICETREE = "ast2600-ieisystem-fp5280g3"
 SPL_BINARY = "spl/u-boot-spl.bin"
 
 require conf/distro/include/phosphor-mmc.inc
diff --git a/meta-ieisystems/meta-fp5280g3/conf/templates/default/bblayers.conf.sample b/meta-ieisystem/meta-fp5280g3/conf/templates/default/bblayers.conf.sample
similarity index 85%
rename from meta-ieisystems/meta-fp5280g3/conf/templates/default/bblayers.conf.sample
rename to meta-ieisystem/meta-fp5280g3/conf/templates/default/bblayers.conf.sample
index 8b2699e..d8485a5 100644
--- a/meta-ieisystems/meta-fp5280g3/conf/templates/default/bblayers.conf.sample
+++ b/meta-ieisystem/meta-fp5280g3/conf/templates/default/bblayers.conf.sample
@@ -14,6 +14,6 @@
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-aspeed \
   ##OEROOT##/meta-openpower \
-  ##OEROOT##/meta-ieisystems \
-  ##OEROOT##/meta-ieisystems/meta-fp5280g3 \
+  ##OEROOT##/meta-ieisystem \
+  ##OEROOT##/meta-ieisystem/meta-fp5280g3 \
   "
diff --git a/meta-ieisystems/meta-fp5280g3/conf/templates/default/conf-notes.txt b/meta-ieisystem/meta-fp5280g3/conf/templates/default/conf-notes.txt
similarity index 100%
rename from meta-ieisystems/meta-fp5280g3/conf/templates/default/conf-notes.txt
rename to meta-ieisystem/meta-fp5280g3/conf/templates/default/conf-notes.txt
diff --git a/meta-ieisystems/meta-fp5280g3/conf/templates/default/local.conf.sample b/meta-ieisystem/meta-fp5280g3/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-ieisystems/meta-fp5280g3/conf/templates/default/local.conf.sample
rename to meta-ieisystem/meta-fp5280g3/conf/templates/default/local.conf.sample
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-extended/timezone/tzdata.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-extended/timezone/tzdata.bbappend
similarity index 100%
rename from meta-ieisystems/meta-fp5280g3/recipes-extended/timezone/tzdata.bbappend
rename to meta-ieisystem/meta-fp5280g3/recipes-extended/timezone/tzdata.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-kernel/linux/linux-aspeed/fp5280g3.cfg b/meta-ieisystem/meta-fp5280g3/recipes-kernel/linux/linux-aspeed/fp5280g3.cfg
similarity index 100%
rename from meta-ieisystems/meta-fp5280g3/recipes-kernel/linux/linux-aspeed/fp5280g3.cfg
rename to meta-ieisystem/meta-fp5280g3/recipes-kernel/linux/linux-aspeed/fp5280g3.cfg
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-kernel/linux/linux-aspeed_%.bbappend
similarity index 100%
rename from meta-ieisystems/meta-fp5280g3/recipes-kernel/linux/linux-aspeed_%.bbappend
rename to meta-ieisystem/meta-fp5280g3/recipes-kernel/linux/linux-aspeed_%.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config.bb b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config.bb
similarity index 100%
rename from meta-ieisystems/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config.bb
rename to meta-ieisystem/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config.bb
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-fru-properties.yaml b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-fru-properties.yaml
similarity index 100%
rename from meta-ieisystems/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-fru-properties.yaml
rename to meta-ieisystem/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-fru-properties.yaml
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-fru.yaml b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-fru.yaml
similarity index 100%
rename from meta-ieisystems/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-fru.yaml
rename to meta-ieisystem/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-fru.yaml
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-inventory-sensors.yaml b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-inventory-sensors.yaml
similarity index 100%
rename from meta-ieisystems/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-inventory-sensors.yaml
rename to meta-ieisystem/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-inventory-sensors.yaml
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-sensors.yaml b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-sensors.yaml
similarity index 100%
rename from meta-ieisystems/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-sensors.yaml
rename to meta-ieisystem/meta-fp5280g3/recipes-phosphor/configuration/fp5280g3-yaml-config/fp5280g3-ipmi-sensors.yaml
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/dbus/events-policy.bb b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/dbus/events-policy.bb
similarity index 100%
rename from meta-ieisystems/meta-fp5280g3/recipes-phosphor/dbus/events-policy.bb
rename to meta-ieisystem/meta-fp5280g3/recipes-phosphor/dbus/events-policy.bb
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/dbus/events-policy/config.yaml b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/dbus/events-policy/config.yaml
similarity index 100%
rename from meta-ieisystems/meta-fp5280g3/recipes-phosphor/dbus/events-policy/config.yaml
rename to meta-ieisystem/meta-fp5280g3/recipes-phosphor/dbus/events-policy/config.yaml
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend
similarity index 100%
rename from meta-ieisystems/meta-fp5280g3/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend
rename to meta-ieisystem/meta-fp5280g3/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
similarity index 100%
rename from meta-ieisystems/meta-fp5280g3/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
rename to meta-ieisystem/meta-fp5280g3/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/images/obmc-phosphor-image.bbappend
similarity index 100%
rename from meta-ieisystems/meta-fp5280g3/recipes-phosphor/images/obmc-phosphor-image.bbappend
rename to meta-ieisystem/meta-fp5280g3/recipes-phosphor/images/obmc-phosphor-image.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
similarity index 100%
rename from meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
rename to meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json
similarity index 100%
rename from meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json
rename to meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json
similarity index 100%
rename from meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json
rename to meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/power_reading.json b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/power_reading.json
similarity index 100%
rename from meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/power_reading.json
rename to meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-config/power_reading.json
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
similarity index 100%
rename from meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
rename to meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
similarity index 100%
rename from meta-ieisystems/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
rename to meta-ieisystem/meta-fp5280g3/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json
similarity index 100%
rename from meta-ieisystems/meta-fp5280g3/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json
rename to meta-ieisystem/meta-fp5280g3/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
similarity index 100%
rename from meta-ieisystems/meta-fp5280g3/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
rename to meta-ieisystem/meta-fp5280g3/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/libmctp/files/mctp b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/libmctp/files/mctp
similarity index 100%
rename from meta-ieisystems/meta-fp5280g3/recipes-phosphor/libmctp/files/mctp
rename to meta-ieisystem/meta-fp5280g3/recipes-phosphor/libmctp/files/mctp
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/libmctp/files/service-override.conf b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/libmctp/files/service-override.conf
similarity index 100%
rename from meta-ieisystems/meta-fp5280g3/recipes-phosphor/libmctp/files/service-override.conf
rename to meta-ieisystem/meta-fp5280g3/recipes-phosphor/libmctp/files/service-override.conf
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/libmctp/libmctp_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/libmctp/libmctp_%.bbappend
similarity index 100%
rename from meta-ieisystems/meta-fp5280g3/recipes-phosphor/libmctp/libmctp_%.bbappend
rename to meta-ieisystem/meta-fp5280g3/recipes-phosphor/libmctp/libmctp_%.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/libpldm/libpldm_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/libpldm/libpldm_%.bbappend
similarity index 100%
rename from meta-ieisystems/meta-fp5280g3/recipes-phosphor/libpldm/libpldm_%.bbappend
rename to meta-ieisystem/meta-fp5280g3/recipes-phosphor/libpldm/libpldm_%.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/mboxd/mboxd_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/mboxd/mboxd_%.bbappend
similarity index 100%
rename from meta-ieisystems/meta-fp5280g3/recipes-phosphor/mboxd/mboxd_%.bbappend
rename to meta-ieisystem/meta-fp5280g3/recipes-phosphor/mboxd/mboxd_%.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/occ/openpower-occ-control_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/occ/openpower-occ-control_%.bbappend
similarity index 100%
rename from meta-ieisystems/meta-fp5280g3/recipes-phosphor/occ/openpower-occ-control_%.bbappend
rename to meta-ieisystem/meta-fp5280g3/recipes-phosphor/occ/openpower-occ-control_%.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
similarity index 100%
rename from meta-ieisystems/meta-fp5280g3/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
rename to meta-ieisystem/meta-fp5280g3/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/pldm/pldm_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/pldm/pldm_%.bbappend
similarity index 100%
rename from meta-ieisystems/meta-fp5280g3/recipes-phosphor/pldm/pldm_%.bbappend
rename to meta-ieisystem/meta-fp5280g3/recipes-phosphor/pldm/pldm_%.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json
similarity index 100%
rename from meta-ieisystems/meta-fp5280g3/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json
rename to meta-ieisystem/meta-fp5280g3/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
similarity index 100%
rename from meta-ieisystems/meta-fp5280g3/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
rename to meta-ieisystem/meta-fp5280g3/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/settings/phosphor-settings-manager/applyTime.override.yml b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/settings/phosphor-settings-manager/applyTime.override.yml
similarity index 100%
rename from meta-ieisystems/meta-fp5280g3/recipes-phosphor/settings/phosphor-settings-manager/applyTime.override.yml
rename to meta-ieisystem/meta-fp5280g3/recipes-phosphor/settings/phosphor-settings-manager/applyTime.override.yml
diff --git a/meta-ieisystems/meta-fp5280g3/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-ieisystem/meta-fp5280g3/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
similarity index 100%
rename from meta-ieisystems/meta-fp5280g3/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
rename to meta-ieisystem/meta-fp5280g3/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
diff --git a/meta-ieisystems/meta-nf5280m7/conf/layer.conf b/meta-ieisystem/meta-nf5280m7/conf/layer.conf
similarity index 100%
rename from meta-ieisystems/meta-nf5280m7/conf/layer.conf
rename to meta-ieisystem/meta-nf5280m7/conf/layer.conf
diff --git a/meta-ieisystems/meta-nf5280m7/conf/machine/nf5280m7.conf b/meta-ieisystem/meta-nf5280m7/conf/machine/nf5280m7.conf
similarity index 74%
rename from meta-ieisystems/meta-nf5280m7/conf/machine/nf5280m7.conf
rename to meta-ieisystem/meta-nf5280m7/conf/machine/nf5280m7.conf
index 2f020ad..5a47f0e 100644
--- a/meta-ieisystems/meta-nf5280m7/conf/machine/nf5280m7.conf
+++ b/meta-ieisystem/meta-nf5280m7/conf/machine/nf5280m7.conf
@@ -1,12 +1,12 @@
 # Add a device tree for nf5280m7
 KMACHINE = "aspeed"
 KERNEL_DEVICETREE = " \
-    aspeed/${KMACHINE}-bmc-ieisystems-${MACHINE}.dtb \
+    aspeed/${KMACHINE}-bmc-ieisystem-${MACHINE}.dtb \
 "
 
 UBOOT_MACHINE = "ast2600_openbmc_spl_defconfig"
 UBOOT_DEVICETREE = "ast2600-evb"
-# UBOOT_DEVICETREE = "${UMACHINE}-ieisystems-${MACHINE}"
+# UBOOT_DEVICETREE = "${UMACHINE}-ieisystem-${MACHINE}"
 SPL_BINARY = "spl/u-boot-spl.bin"
 
 require conf/machine/include/ast2600.inc
diff --git a/meta-ieisystems/meta-nf5280m7/conf/templates/default/bblayers.conf.sample b/meta-ieisystem/meta-nf5280m7/conf/templates/default/bblayers.conf.sample
similarity index 85%
rename from meta-ieisystems/meta-nf5280m7/conf/templates/default/bblayers.conf.sample
rename to meta-ieisystem/meta-nf5280m7/conf/templates/default/bblayers.conf.sample
index 6297743..4610012 100644
--- a/meta-ieisystems/meta-nf5280m7/conf/templates/default/bblayers.conf.sample
+++ b/meta-ieisystem/meta-nf5280m7/conf/templates/default/bblayers.conf.sample
@@ -14,7 +14,7 @@
   ##OEROOT##/meta-security \
   ##OEROOT##/meta-phosphor \
   ##OEROOT##/meta-aspeed \
-  ##OEROOT##/meta-ieisystems \
-  ##OEROOT##/meta-ieisystems/meta-nf5280m7 \
+  ##OEROOT##/meta-ieisystem \
+  ##OEROOT##/meta-ieisystem/meta-nf5280m7 \
   "
 
diff --git a/meta-ieisystems/meta-nf5280m7/conf/templates/default/conf-notes.txt b/meta-ieisystem/meta-nf5280m7/conf/templates/default/conf-notes.txt
similarity index 100%
rename from meta-ieisystems/meta-nf5280m7/conf/templates/default/conf-notes.txt
rename to meta-ieisystem/meta-nf5280m7/conf/templates/default/conf-notes.txt
diff --git a/meta-ieisystems/meta-nf5280m7/conf/templates/default/local.conf.sample b/meta-ieisystem/meta-nf5280m7/conf/templates/default/local.conf.sample
similarity index 100%
rename from meta-ieisystems/meta-nf5280m7/conf/templates/default/local.conf.sample
rename to meta-ieisystem/meta-nf5280m7/conf/templates/default/local.conf.sample
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-kernel/linux/linux-aspeed/nf5280m7/nf5280m7.cfg b/meta-ieisystem/meta-nf5280m7/recipes-kernel/linux/linux-aspeed/nf5280m7/nf5280m7.cfg
similarity index 100%
rename from meta-ieisystems/meta-nf5280m7/recipes-kernel/linux/linux-aspeed/nf5280m7/nf5280m7.cfg
rename to meta-ieisystem/meta-nf5280m7/recipes-kernel/linux/linux-aspeed/nf5280m7/nf5280m7.cfg
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-ieisystem/meta-nf5280m7/recipes-kernel/linux/linux-aspeed_%.bbappend
similarity index 100%
rename from meta-ieisystems/meta-nf5280m7/recipes-kernel/linux/linux-aspeed_%.bbappend
rename to meta-ieisystem/meta-nf5280m7/recipes-kernel/linux/linux-aspeed_%.bbappend
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config.bb b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config.bb
similarity index 100%
rename from meta-ieisystems/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config.bb
rename to meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config.bb
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-fru-properties.yaml b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-fru-properties.yaml
similarity index 100%
rename from meta-ieisystems/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-fru-properties.yaml
rename to meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-fru-properties.yaml
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-fru.yaml b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-fru.yaml
similarity index 100%
rename from meta-ieisystems/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-fru.yaml
rename to meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-fru.yaml
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-inventory-sensors.yaml b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-inventory-sensors.yaml
similarity index 100%
rename from meta-ieisystems/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-inventory-sensors.yaml
rename to meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-inventory-sensors.yaml
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-sensors.yaml b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-sensors.yaml
similarity index 100%
rename from meta-ieisystems/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-sensors.yaml
rename to meta-ieisystem/meta-nf5280m7/recipes-phosphor/configuration/nf5280m7-yaml-config/nf5280m7-ipmi-sensors.yaml
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
similarity index 100%
rename from meta-ieisystems/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
rename to meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json
similarity index 100%
rename from meta-ieisystems/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json
rename to meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json
similarity index 100%
rename from meta-ieisystems/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json
rename to meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
similarity index 100%
rename from meta-ieisystems/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
rename to meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
similarity index 100%
rename from meta-ieisystems/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
rename to meta-ieisystem/meta-nf5280m7/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json
similarity index 100%
rename from meta-ieisystems/meta-nf5280m7/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json
rename to meta-ieisystem/meta-nf5280m7/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
similarity index 100%
rename from meta-ieisystems/meta-nf5280m7/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
rename to meta-ieisystem/meta-nf5280m7/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
diff --git a/meta-ieisystems/meta-nf5280m7/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ieisystem/meta-nf5280m7/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
similarity index 100%
rename from meta-ieisystems/meta-nf5280m7/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
rename to meta-ieisystem/meta-nf5280m7/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
diff --git a/meta-ieisystems/recipes-ieisystems/ipmi/iei-ipmi-oem_git.bb b/meta-ieisystem/recipes-ieisystem/ipmi/iei-ipmi-oem_git.bb
similarity index 100%
rename from meta-ieisystems/recipes-ieisystems/ipmi/iei-ipmi-oem_git.bb
rename to meta-ieisystem/recipes-ieisystem/ipmi/iei-ipmi-oem_git.bb
diff --git a/meta-ieisystems/conf/layer.conf b/meta-ieisystems/conf/layer.conf
deleted file mode 100644
index 60f56a9..0000000
--- a/meta-ieisystems/conf/layer.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# We have a conf and classes directory, add to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-# We have recipes-* directories, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
-            ${LAYERDIR}/recipes-*/*/*.bbappend"
-
-BBFILE_COLLECTIONS += "ieisystems-layer"
-BBFILE_PATTERN_ieisystems-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_ieisystems-layer = "nanbield scarthgap"