Reordering code to keep alloc/free functions together.

Signed-off-by: Robert Richter <robert.richter@amd.com>