Reordering code to keep alloc/free functions together.
Signed-off-by: NRobert Richter <robert.richter@amd.com>