Move things at their right location and add missing comment. Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>