This restructure showed that we introduce them just so easily Signed-off-by: Guido Günther <agx@sigxcpu.org>