This change moves a few things around, like separating ptest package
definitions from their corresponding package definitions.

Signed-off-by: Thierry Escande <thierry.escande@huawei.com>