Moving some code in preparation of the next patch.
Signed-off-by: NRobert Richter <robert.richter@amd.com>