diff --git a/lib/oem/ibm/bios_attr_utils.robot b/lib/bios_attr_utils.robot
similarity index 100%
rename from lib/oem/ibm/bios_attr_utils.robot
rename to lib/bios_attr_utils.robot
diff --git a/oem/ibm/test_bios_attributes.robot b/openpower/test_bios_attributes.robot
similarity index 94%
rename from oem/ibm/test_bios_attributes.robot
rename to openpower/test_bios_attributes.robot
index cc38cef..460ff58 100755
--- a/oem/ibm/test_bios_attributes.robot
+++ b/openpower/test_bios_attributes.robot
@@ -1,13 +1,13 @@
 *** Settings ***
 Documentation    This suite test various BIOS attributes operations using Redfish.
 
-Resource         ../../lib/resource.robot
-Resource         ../../lib/bmc_redfish_resource.robot
-Resource         ../../lib/common_utils.robot
-Resource         ../../lib/openbmc_ffdc.robot
-Resource         ../../lib/oem/ibm/bios_attr_utils.robot
-Library          ../../lib/pldm_utils.py
-Variables        ../../data/pldm_variables.py
+Resource         ../lib/resource.robot
+Resource         ../lib/bmc_redfish_resource.robot
+Resource         ../lib/common_utils.robot
+Resource         ../lib/openbmc_ffdc.robot
+Resource         ../lib/bios_attr_utils.robot
+Library          ../lib/pldm_utils.py
+Variables        ../data/pldm_variables.py
 
 Test Teardown    FFDC On Test Case Fail