diff --git a/README.md b/README.md
index 8b793f9..a173059 100644
--- a/README.md
+++ b/README.md
@@ -116,8 +116,6 @@
 `snmp/`: Contains test cases for SNMP (Simple Network Management Protocol)
          configuration testing.
 
-`remote_logging`: Contains test cases for remote logging via rsyslog.
-
 `openpower/ras/`: Contains test cases for RAS (Reliability, Availability and
                   Serviceability) for an OpenPOWER system.
 
@@ -140,6 +138,9 @@
 modern and secure management of scalable platform hardware.
 
 `redfish`: Contains test cases for DMTF Redfish-related feature supported on OpenBMC.
+`redfish/extended/`: Contains test cases for combined legacy REST and DMTF Redfish-related
+                     feature supported on OpenBMC.
+
 
 
 ## Quickstart ##
diff --git a/remote_logging/test_remote_logging.robot b/redfish/extended/test_remote_logging.robot
similarity index 96%
rename from remote_logging/test_remote_logging.robot
rename to redfish/extended/test_remote_logging.robot
index 5cc96e1..758a0a9 100644
--- a/remote_logging/test_remote_logging.robot
+++ b/redfish/extended/test_remote_logging.robot
@@ -9,12 +9,13 @@
 # REMOTE_PASSWORD           The password for the remote logging server.
 
 Library          String
-Resource         ../lib/openbmc_ffdc.robot
-Resource         ../lib/boot_utils.robot
-Resource         ../lib/remote_logging_utils.robot
-Resource         ../lib/bmc_redfish_resource.robot
-Resource         ../lib/ipmi_client.robot
-Library          ../lib/gen_misc.py
+Resource         ../../lib/openbmc_ffdc.robot
+Resource         ../../lib/boot_utils.robot
+Resource         ../../lib/remote_logging_utils.robot
+Resource         ../../lib/bmc_redfish_resource.robot
+Resource         ../../lib/ipmi_client.robot
+Resource         ../../lib/bmc_redfish_resource.robot
+Library          ../../lib/gen_misc.py
 
 Suite Setup      Suite Setup Execution
 Test Setup       Test Setup Execution
@@ -23,7 +24,7 @@
 *** Variables ***
 
 # Strings to check from journald.
-${BMC_STOP_MSG}          Stopping Phosphor IPMI BT DBus Bridge
+${BMC_STOP_MSG}          Stopping Network IPMI daemon
 ${BMC_START_MSG}         Starting Flush Journal to Persistent Storage
 ${BMC_BOOT_MSG}          Startup finished in
 ${BMC_SYSLOG_REGEX}      dropbear|vrm-control.sh
@@ -289,7 +290,7 @@
     Start Journal Log  filter=${cmd}
 
     # Irrespective of the outcome, the journald should be synced.
-    Run Keyword And Ignore Error  REST Power On
+    Run Keyword And Ignore Error  Redfish Power On
     ${bmc_journald}=  Stop Journal Log
 
     ${cmd}=  Catenate  SEPARATOR=  egrep '${bmc_hostname}' /var/log/syslog